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

Fix regressions from recent changes

Browse Source
This commit is contained in:
natemaia 2018-09-01 13:00:39 -07:00
parent 432e82f651
commit fe1749bed5
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/archlabs-installer
View File

@ -12,7 +12,7 @@
# immutable variables { # immutable variables {
readonly DIST="ArchLabs" # Linux distributor readonly DIST="ArchLabs" # Linux distributor
readonly VER="1.6.69" # Installer version readonly VER="1.6.70" # Installer version
readonly LIVE="liveuser" # Live session user readonly LIVE="liveuser" # Live session user
readonly MNT="/mnt/install" # Install mountpoint readonly MNT="/mnt/install" # Install mountpoint
readonly ERR="/tmp/errlog" # Built-in error log readonly ERR="/tmp/errlog" # Built-in error log
@ -298,7 +298,7 @@ window_manager() {
for wm in $INSTALL_WMS; do for wm in $INSTALL_WMS; do
LOGIN_CHOICES="${LOGIN_CHOICES}$wm - " LOGIN_CHOICES="${LOGIN_CHOICES}$wm - "
case $wm in case $wm in
openbox) WM_PACKAGES="$WM_PACKAGES $wm obconf archlabs-obkey archlabs-kickshaw archlabs-skippy-xd tint2 conky" ;; openbox) WM_PACKAGES="$WM_PACKAGES $wm obconf archlabs-obkey archlabs-kickshaw archlabs-skippy-xd tint2 conky jgmenu" ;;
bspwm) WM_PACKAGES="$WM_PACKAGES $wm sxhkd" ;; bspwm) WM_PACKAGES="$WM_PACKAGES $wm sxhkd" ;;
i3-gaps) WM_PACKAGES="$WM_PACKAGES $wm i3status perl-anyevent-i3" ;; i3-gaps) WM_PACKAGES="$WM_PACKAGES $wm i3status perl-anyevent-i3" ;;
gnome) WM_PACKAGES="$WM_PACKAGES $wm gnome-extra" ;; gnome) WM_PACKAGES="$WM_PACKAGES $wm gnome-extra" ;;
@ -308,9 +308,9 @@ window_manager() {
done done
if [[ $INSTALL_WMS =~ (openbox|bspwm|i3-gaps) ]]; then if [[ $INSTALL_WMS =~ (openbox|bspwm|i3-gaps) ]]; then
WM_PACKAGES="$WM_PACKAGES termite thunar archlabs-polybar archlabs-screenlock archlabs-oblogout lxappearance" WM_PACKAGES="$WM_PACKAGES archlabs-polybar jsoncpp libmpdclient archlabs-screenlock archlabs-oblogout archlabs-paranoid lxappearance rofi termite thunar"
elif [[ $INSTALL_WMS =~ (xfce4) ]]; then elif [[ $INSTALL_WMS =~ (xfce4) ]]; then
WM_PACKAGES="$WM_PACKAGES archlabs-oblogout archlabs-screenlock" WM_PACKAGES="$WM_PACKAGES archlabs-oblogout archlabs-screenlock archlabs-paranoid"
fi fi
# choose which to login # choose which to login
@ -596,6 +596,9 @@ main() {
esac esac
} }
# must be done first
init_variables
for file in /usr/share/archlabs/installer/lib/?*.sh; do for file in /usr/share/archlabs/installer/lib/?*.sh; do
source_file $file source_file $file
done done
@ -607,7 +610,6 @@ for arg in $@; do case $arg in
--debug|-d) debug ;; --debug|-d) debug ;;
esac done esac done
init_variables
select_language select_language
setup_keymap setup_keymap
check_requirements check_requirements

2
src/lib/install.sh
View File

@ -146,7 +146,7 @@ create_user() {
sed -i "s/${LIVE}/${NEWUSER}/g" $_home/.config/gtk-3.0/bookmarks $_home/.mozilla/firefox/archlabs.default/{prefs,sessionstore}.js sed -i "s/${LIVE}/${NEWUSER}/g" $_home/.config/gtk-3.0/bookmarks $_home/.mozilla/firefox/archlabs.default/{prefs,sessionstore}.js
! [[ $INSTALL_WMS =~ openbox ]] && rm -rf $_home/.config/{openbox} ! [[ $INSTALL_WMS =~ openbox ]] && rm -rf $_home/.config/{openbox,skippy-xd,jgmenu,conky,tint2}
! [[ $INSTALL_WMS =~ bspwm ]] && rm -rf $_home/.config/{bspwm,sxhkd} ! [[ $INSTALL_WMS =~ bspwm ]] && rm -rf $_home/.config/{bspwm,sxhkd}
! [[ $INSTALL_WMS =~ i3-gaps ]] && rm -rf $_home/.config/i3 ! [[ $INSTALL_WMS =~ i3-gaps ]] && rm -rf $_home/.config/i3

2
src/lib/mount.sh
View File

@ -352,7 +352,7 @@ select_swap() {
# Ask user to select partition or create swapfile # Ask user to select partition or create swapfile
tput civis tput civis
SWAP="$(dialog --backtitle "$BT" --cr-wrap --stdout --title " $_SelSwpSetup " \ SWAP="$(dialog --backtitle "$BT" --cr-wrap --stdout --title " $_SelSwpSetup " \
--menu "$_SelSwpBody" 0 0 0 "$_SelSwpNone" "-" "$_SelSwpFile" "-" $PARTS)" --menu "$_SelSwpBody" 0 0 0 "$_SelSwpNone" "-" "$_SelSwpFile" "${SYS_MEM}M" $PARTS)"
[[ $? != 0 || $SWAP == "$_SelSwpNone" ]] && return 0 [[ $? != 0 || $SWAP == "$_SelSwpNone" ]] && return 0
if [[ $SWAP == "$_SelSwpFile" ]]; then if [[ $SWAP == "$_SelSwpFile" ]]; then

2
src/lib/utils.sh
View File

@ -71,7 +71,7 @@ check_for_errors() {
msg="$([[ $err == "" ]] && echo -n "$msg")\n$_ErrChoiceConsole" msg="$([[ $err == "" ]] && echo -n "$msg")\n$_ErrChoiceConsole"
yesno "$_ErrTitle" "$msg" "Exit & Open Log" "Ignore & Continue" && { less /tmp/debug-log; die 0; } yesno "$_ErrTitle" "$msg" "Exit & Open Log" "Ignore & Continue" && { less /tmp/debug-log; die 0; }
else else
yesno "$_ErrTitle" "$msg" "Exit & Shutdown" "Ignore & Continue" && die 'shutdown' yesno "$_ErrTitle" "$msg" "Exit & Shutdown" "Ignore & Continue" && die 'shutdown -h now'
fi fi
return 0 return 0