xstefen/al-installer
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update and clean up some functions

Browse Source
This commit is contained in:
natemaia
2018-12-14 01:47:39 -08:00
parent c815cb7f02
commit f96435486a
5 changed files with 99 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/archlabs-installer
View File

@ -10,7 +10,7 @@
# immutable globals
readonly VER="1.7.28" # Installer version
readonly VER="1.7.29" # Installer version
readonly DIST="ArchLabs" # Linux distributor
readonly MNT="/mnt" # Install mountpoint
readonly ERR="/tmp/errlog" # Built-in error log
@ -43,8 +43,9 @@ main()
preinstall_checks 1 || return 1
elif (( SELECTED == 6 )); then
preinstall_checks || return 1
elif (( SELECTED == 2 || SELECTED == 5 )) && [[ $WARN != true ]]; then
msgbox "$_PrepTitle" "$_WarnMount" && WARN=true
elif [[ $WARN != true ]] && (( SELECTED == 2 || SELECTED == 5 )); then
msgbox "$_PrepTitle" "$_WarnMount"
WARN=true
fi
fi
@ -56,14 +57,17 @@ main()
5) mnt_menu || SELECTED=$((SELECTED - 1)) ;;
6) cfg_menu || SELECTED=$((SELECTED - 1)) ;;
7) show_cfg ;;
8) install ;;
8) install ;;
*) yesno "$_CloseInst" "$_CloseInstBody" "Exit" "Back" && die
esac
}
# source all the lib files
for i in /usr/share/archlabs/installer/lib/?*.sh; do
. "$i" || { printf "\nFailed to source library file %s\n" "$i"; die 1; }
if ! . "$i" 2>/dev/null; then
printf "\nFailed to source library file %s\n" "$i"
die 1
fi
done
# trap Ctrl-C to properly exit