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

version bump and remove extra spaces in package list

Browse Source
This commit is contained in:
natemaia 2019-01-18 22:43:45 -08:00
parent 5f2d2ba885
commit 6ce3e9aa7f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/archlabs-installer
View File

@ -8,7 +8,7 @@
# Some ideas and code has been taken from other installers # Some ideas and code has been taken from other installers
# AIF, Cnichi, Calamares, The Arch Wiki.. Credit where credit is due # AIF, Cnichi, Calamares, The Arch Wiki.. Credit where credit is due
VER="1.8.37" # version VER="1.8.38" # version
DIST="ArchLabs" # distributor DIST="ArchLabs" # distributor
MNT="/mnt" # install mountpoint MNT="/mnt" # install mountpoint
@ -261,7 +261,9 @@ show_cfg()
{ {
local cmd="${BCMDS[$BOOTLDR]}" local cmd="${BCMDS[$BOOTLDR]}"
local mnt="${BMNTS[$SYS-$BOOTLDR]}" local mnt="${BMNTS[$SYS-$BOOTLDR]}"
local pkgs="${USER_PKGS# } ${PACKAGES# }" local pkgs="${USER_PKGS# }"
pkgs="${pkgs% }"
pkgs="${pkgs% } ${PACKAGES# }"
[[ $INSTALL_WMS == *dwm* ]] && pkgs="dwm st dmenu ${pkgs# }" [[ $INSTALL_WMS == *dwm* ]] && pkgs="dwm st dmenu ${pkgs# }"
pkgs="${pkgs# }" pkgs="${pkgs# }"
pkgs="${pkgs% }" pkgs="${pkgs% }"
@ -660,8 +662,10 @@ select_packages()
[[ ${PKG_EXT[$i]} && $USER_PKGS != *"${PKG_EXT[$i]}"* ]] && USER_PKGS+=" ${PKG_EXT[$i]}" [[ ${PKG_EXT[$i]} && $USER_PKGS != *"${PKG_EXT[$i]}"* ]] && USER_PKGS+=" ${PKG_EXT[$i]}"
done done
USER_PKGS="${USER_PKGS// / }"
USER_PKGS="${USER_PKGS// / }" USER_PKGS="${USER_PKGS// / }"
USER_PKGS="${USER_PKGS# }" USER_PKGS="${USER_PKGS# }"
USER_PKGS="${USER_PKGS% }"
return 0 return 0
} }