Merge pull request #469 from vincent-legoll/fix-text-ui
Trivial fixes for some text UI
This commit is contained in:
Igor Pečovnik
GitHub
commit
0f431dde59
@ -377,11 +377,11 @@ install_external_applications()
|
||||
write_uboot()
|
||||
{
|
||||
local loop=$1
|
||||
display_alert "Writing bootloader" "$loop" "info"
|
||||
display_alert "Writing U-boot bootloader" "$loop" "info"
|
||||
mkdir -p /tmp/u-boot/
|
||||
dpkg -x ${DEST}/debs/${CHOSEN_UBOOT}_${REVISION}_${ARCH}.deb /tmp/u-boot/
|
||||
write_uboot_platform "/tmp/u-boot/usr/lib/${CHOSEN_UBOOT}_${REVISION}_${ARCH}" "$loop"
|
||||
[[ $? -ne 0 ]] && exit_with_error "U-boot failed to install" "@host"
|
||||
[[ $? -ne 0 ]] && exit_with_error "U-boot bootloader failed to install" "@host"
|
||||
rm -r /tmp/u-boot/
|
||||
sync
|
||||
}
|
||||
|
||||
@ -37,7 +37,7 @@ MAINLINE_UBOOT_SOURCE='git://git.denx.de/u-boot.git'
|
||||
MAINLINE_UBOOT_BRANCH='tag:v2016.09'
|
||||
MAINLINE_UBOOT_DIR='u-boot'
|
||||
|
||||
# Let's set defalt data if not defined in board configuration above
|
||||
# Let's set default data if not defined in board configuration above
|
||||
|
||||
OFFSET=1 # Bootloader space in MB (1 x 2048 = default)
|
||||
ARCH=armhf
|
||||
|
||||
6
main.sh
6
main.sh
@ -50,7 +50,7 @@ date +"%d_%m_%Y-%H_%M_%S" > $DEST/debug/timestamp
|
||||
ver1=$(awk -F"=" '/^# VERSION/ {print $2}' <"$SRC/compile.sh")
|
||||
ver2=$(awk -F"=" '/^# VERSION/ {print $2}' <"$SRC/lib/compile.sh" 2>/dev/null) || ver2=0
|
||||
if [[ -z $ver1 || $ver1 -lt $ver2 ]]; then
|
||||
display_alert "File $0 is outdated. Please overwrite is with an updated version from" "$SRC/lib" "wrn"
|
||||
display_alert "File $0 is outdated. Please overwrite it with an updated version from" "$SRC/lib" "wrn"
|
||||
echo -e "Press \e[0;33m<Ctrl-C>\x1B[0m to abort compilation, \e[0;33m<Enter>\x1B[0m to ignore and continue"
|
||||
read
|
||||
fi
|
||||
@ -137,7 +137,7 @@ if [[ $KERNEL_ONLY != yes && -z $RELEASE ]]; then
|
||||
options+=("jessie" "Debian 8 Jessie (stable)")
|
||||
options+=("trusty" "Ubuntu Trusty 14.04.x LTS")
|
||||
options+=("xenial" "Ubuntu Xenial 16.04.x LTS")
|
||||
RELEASE=$(dialog --stdout --title "Choose a release" --backtitle "$backtitle" --menu "Select one of supported releases" $TTY_Y $TTY_X $(($TTY_Y - 8)) "${options[@]}")
|
||||
RELEASE=$(dialog --stdout --title "Choose a release" --backtitle "$backtitle" --menu "Select one of the supported releases" $TTY_Y $TTY_X $(($TTY_Y - 8)) "${options[@]}")
|
||||
unset options
|
||||
[[ -z $RELEASE ]] && exit_with_error "No release selected"
|
||||
fi
|
||||
@ -236,7 +236,7 @@ VER="${VER/-$LINUXFAMILY/}"
|
||||
if [[ $KERNEL_ONLY != yes ]]; then
|
||||
debootstrap_ng
|
||||
else
|
||||
display_alert "Kernel building done" "@host" "info"
|
||||
display_alert "Kernel build done" "@host" "info"
|
||||
display_alert "Target directory" "$DEST/debs/" "info"
|
||||
display_alert "File name" "${CHOSEN_KERNEL}_${REVISION}_${ARCH}.deb" "info"
|
||||
fi
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
# This file is a part of tool chain https://github.com/igorpecovnik/lib
|
||||
#
|
||||
|
||||
# This scripts shows packages in local repository
|
||||
# This script shows packages in local repository
|
||||
|
||||
# load functions
|
||||
source general.sh
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
# This file is a part of tool chain https://github.com/igorpecovnik/lib
|
||||
#
|
||||
|
||||
# This scripts recreates deb repository from files in directory POT
|
||||
# This script recreates deb repository from files in directory POT
|
||||
#
|
||||
# each file is added three times! wheezy-jessie-trusty
|
||||
#
|
||||
|
||||
18
upgrade.sh
18
upgrade.sh
@ -24,9 +24,9 @@ title="Armbian universal installer 2015.11"
|
||||
display_warning()
|
||||
{
|
||||
read -r -d '' MOJTEXT << EOM
|
||||
1. Please do a backup even the script doesn't plan to ruin anything critical.
|
||||
1. Please do a backup even if the script doesn't plan to ruin anything critical.
|
||||
|
||||
2. If you choose wrong board you might end up with not bootable system.
|
||||
2. If you choose the wrong board you might end up with a non-bootable system.
|
||||
|
||||
3. We are going to remove current kernel package together with headers, firmware and board definitions.
|
||||
|
||||
@ -189,7 +189,7 @@ A20 Lime2 A20 Micro A20 Bananapipro A20 Lamobo-R1 A20 Orangepi A20 Pcduino3nano
|
||||
BOARD=${BoardChoices,,}
|
||||
fi
|
||||
# exit the script on cancel
|
||||
if [ "$BOARD" == "" ]; then echo "ERROR: You have to choose one board"; exit; fi
|
||||
if [ "$BOARD" == "" ]; then echo "ERROR: You have to choose a board"; exit; fi
|
||||
|
||||
|
||||
if [ -z "$BRANCH" ]; then
|
||||
@ -206,7 +206,7 @@ if [ -z "$BRANCH" ]; then
|
||||
fi
|
||||
|
||||
# exit the script on cancel
|
||||
if [ "$BRANCH" == "" ]; then echo "ERROR: You have to choose one branch"; exit; fi
|
||||
if [ "$BRANCH" == "" ]; then echo "ERROR: You have to choose a branch"; exit; fi
|
||||
|
||||
|
||||
if [[ $BRANCH == "vanilla" ]] ; then
|
||||
@ -251,7 +251,7 @@ remove_old ()
|
||||
#-----------------------------------------------------------------------------------------------------------------------
|
||||
{
|
||||
clear
|
||||
dialog --title "$title" --backtitle "$backtitle" --infobox "\nRemoving conflicting packages ..." 5 41
|
||||
dialog --title "$title" --backtitle "$backtitle" --infobox "\nRemoving conflicting packages..." 5 41
|
||||
aptitude remove ~nlinux-dtb --quiet=100 >> upgrade.log
|
||||
aptitude remove ~nlinux-u-boot --quiet=100 >> upgrade.log
|
||||
aptitude remove ~nlinux-image --quiet=100 >> upgrade.log
|
||||
@ -269,7 +269,7 @@ install_new ()
|
||||
IFS=" "
|
||||
apt-get $1 -y install $PACKETS 2>&1 | dialog --title "$title" --backtitle "$backtitle" --progressbox "$2" 20 80
|
||||
if [ $? -ne 0 ]; then
|
||||
dialog --title "$title" --backtitle "$backtitle" --infobox "\nError downloadiing." 5 41
|
||||
dialog --title "$title" --backtitle "$backtitle" --infobox "\nError during new packages download." 5 41
|
||||
exit 1;
|
||||
fi
|
||||
}
|
||||
@ -283,7 +283,7 @@ fi
|
||||
# This tool must run under root
|
||||
#-----------------------------------------------------------------------------------------------------------------------
|
||||
if [[ ${EUID} -ne 0 ]]; then
|
||||
echo "This tool must run as root. Exiting ..."
|
||||
echo "This tool must be run as root. Exiting..."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@ -297,7 +297,7 @@ if [[ $(dpkg-query -W -f='${Status}' dialog 2>/dev/null | grep -c "ok installed"
|
||||
$(dpkg-query -W -f='${Status}' lsb-release 2>/dev/null | grep -c "ok installed") -eq 0 || \
|
||||
$(dpkg-query -W -f='${Status}' aptitude 2>/dev/null | grep -c "ok installed") -eq 0 \
|
||||
]]; then
|
||||
echo "Downloading dependencies ... please wait"
|
||||
echo "Downloading dependencies... please wait"
|
||||
apt-get install -qq -y dialog u-boot-tools debconf-utils lsb-release aptitude fake-hwclock >/dev/null 2>&1
|
||||
fi
|
||||
|
||||
@ -321,5 +321,5 @@ dialog --title "$title" --backtitle "$backtitle" --yes-label "Reboot" --no-labe
|
||||
--yesno "\nAll done." 7 60
|
||||
if [ $? -eq 0 ]; then reboot; fi
|
||||
|
||||
echo "Visit: forum.armbian.com in case of troubles or just for fun ;)"
|
||||
echo "Visit: forum.armbian.com in case of trouble or just for fun ;)"
|
||||
echo ""
|
||||
|
||||
Loading…
Reference in New Issue
Block a user