From 6ce3e9aa7f05fbf3db4147616fab40cb5aae6edd Mon Sep 17 00:00:00 2001 From: natemaia Date: Fri, 18 Jan 2019 22:43:45 -0800 Subject: [PATCH] version bump and remove extra spaces in package list --- src/archlabs-installer | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/archlabs-installer b/src/archlabs-installer index 1ada1ae..8f3308c 100755 --- a/src/archlabs-installer +++ b/src/archlabs-installer @@ -8,7 +8,7 @@ # Some ideas and code has been taken from other installers # AIF, Cnichi, Calamares, The Arch Wiki.. Credit where credit is due -VER="1.8.37" # version +VER="1.8.38" # version DIST="ArchLabs" # distributor MNT="/mnt" # install mountpoint @@ -261,7 +261,9 @@ show_cfg() { local cmd="${BCMDS[$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# }" pkgs="${pkgs# }" pkgs="${pkgs% }" @@ -660,8 +662,10 @@ select_packages() [[ ${PKG_EXT[$i]} && $USER_PKGS != *"${PKG_EXT[$i]}"* ]] && USER_PKGS+=" ${PKG_EXT[$i]}" done + USER_PKGS="${USER_PKGS// / }" USER_PKGS="${USER_PKGS// / }" USER_PKGS="${USER_PKGS# }" + USER_PKGS="${USER_PKGS% }" return 0 }