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

No longer reboot or shutdown, just exit and let the user handle that step

Browse Source
This commit is contained in:
natemaia
2018-11-08 01:44:05 -08:00
parent 3d41c04f36
commit a37423ff21
4 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/archlabs-installer
View File

@ -14,7 +14,7 @@
# globals {
# immutable values
readonly VER="1.7.13" # Installer version
readonly VER="1.7.14" # Installer version
readonly DIST="ArchLabs" # Linux distributor
readonly LIVE="liveuser" # Live session user
readonly MNT="/mnt/install" # Install mountpoint
@ -76,7 +76,7 @@ select_language() {
8) src $srcdir/dutch.trans && LOC="nl_NL.UTF-8" ;;
9) src $srcdir/hungarian.trans && LOC="hu_HU.UTF-8" FONT="lat2-16" ;;
10) src $srcdir/chinese.trans && LOC="zh_CN.UTF-8" ;;
*) die 0
*) die
esac
sed -i "s/#en_US.UTF-8/en_US.UTF-8/" /etc/locale.gen
@ -546,7 +546,7 @@ edit_system_configs() {
tput civis
local exitstr
[[ $DEBUG == true ]] && exitstr="View Log & Shutdown" || exitstr="Exit & Reboot"
[[ $DEBUG == true ]] && exitstr="View Log & Exit" || exitstr="Exit"
SELECTED=$(dialog --cr-wrap --stdout --backtitle "$BT" \
--title " $_EditTitle " --default-item $SELECTED --menu "$_EditBody" 0 0 0 \
@ -555,8 +555,8 @@ edit_system_configs() {
"9" "${BOOTLDR^}" "10" "Pacman.conf" "11" "${LOGIN_TYPE^}")
if [[ ! $SELECTED || $SELECTED -eq 1 ]]; then
[[ $DEBUG == true ]] && { more /tmp/debug-log; die 'shutdown -h now'; }
die 'systemctl -i reboot'
[[ $DEBUG == true ]] && more /tmp/debug-log
die
else
local existing_files=""
for f in $(printf "%s" "${EDIT_FILES[$SELECTED]}"); do
@ -615,7 +615,7 @@ main() {
6) configure_system_settings || SELECTED=5 ;;
7) display_system_settings ;;
8) install ;;
*) yesno "$_CloseInst" "$_CloseInstBody" "Exit" "Back" && die 0
*) yesno "$_CloseInst" "$_CloseInstBody" "Exit" "Back" && die
esac
}