housekeeping

4 files changed, 30 insertions, 18 deletions

diff --git a/configs/profile/build.sh b/configs/profile/build.sh
index a20824e..9e5960e 100755
--- a/configs/profile/build.sh
+++ b/configs/profile/build.sh
@@ -19,8 +19,8 @@ iso_dirname='parabola'
 enable_offline_install='false'
 enable_tts_brltty='false'
 offline_switch=''
-work_dir=./work
-out_dir=./out/$(echo "${iso_edition}-${iso_version}" | tr '[:upper:]/' '[:lower:]-')
+work_dir=./work/
+out_dir=./out/
 target=''
 verbose=''
 efi_img_kbytes=40000
@@ -149,6 +149,7 @@ make_packages() {
     _cache_base_packages=${_cache_base_packages// /}
     _install_gui_packages=${_install_gui_packages// /}
     _cache_gui_packages=${_cache_gui_packages// /}
+
     # display results
     local _install_packages="${_install_base_packages} ${_install_gui_packages}"
     local _cache_packages="${_cache_base_packages} ${_cache_gui_packages}"
@@ -346,7 +347,7 @@ make_aitab() {
 # Build all filesystem images specified in aitab (.fs.sfs .sfs)
 make_prepare() {
     cp -a -l -f ${work_dir}/${arch}/root-image ${work_dir}
-    setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir} -D ${iso_dirname} pkglist
+    setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir} -D ${iso_dirname} -C ${pacman_conf} pkglist
     setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir} -D ${iso_dirname} -C ${pacman_conf} ${offline_switch} prepare
 
     rm -rf ${work_dir}/root-image
@@ -404,10 +405,10 @@ else
 fi
 iso_title="${iso_title} - ${iso_edition} Edition ${iso_version}"
 iso_filename="parabola-${iso_edition}-${iso_arch}-${iso_type}-${iso_version}.iso"
-iso_filename=$( echo ${iso_filename}                   | tr '[:upper:]/' '[:lower:]-')
-out_dir=./out/$(echo ${iso_edition}-${iso_version}     | tr '[:upper:]/' '[:lower:]-')
-iso_init=$(     echo ${iso_edition}  | cut -d '/' -f 1 | tr '[:upper:]'  '[:lower:]' )
-iso_gui=$(      echo ${iso_edition}  | cut -d '/' -f 2 | tr '[:upper:]'  '[:lower:]' )
+iso_filename=$(     echo ${iso_filename}                   | tr '[:upper:]/' '[:lower:]-')
+out_dir=${out_dir}$(echo ${iso_edition}-${iso_version}     | tr '[:upper:]/' '[:lower:]-')
+iso_init=$(         echo ${iso_edition}  | cut -d '/' -f 1 | tr '[:upper:]'  '[:lower:]' )
+iso_gui=$(          echo ${iso_edition}  | cut -d '/' -f 2 | tr '[:upper:]'  '[:lower:]' )
 [[ "${iso_init}" == 'openrc' ]] && base_group='base-openrc' || base_group='base'
 [[ "${archs}"    == 'i686'   ]] && arch='i686'              || arch='x86_64'
 
diff --git a/configs/profile/rebuild.sh b/configs/profile/rebuild.sh
index 416b947..f896460 100755
--- a/configs/profile/rebuild.sh
+++ b/configs/profile/rebuild.sh
@@ -17,9 +17,17 @@ readonly CACHE=''                   # net-install                 (default)
 # readonly CACHE='-O'               # offline install
 readonly VERSION="`date +%Y.%m.%d`" # for ISO filename            (default)
 # readonly VERSION="`date +%Y.%m.%d-%H.%M`-alpha"
+readonly OUT_DIR=./out/new/
 
 
-((`id -u`)) && echo "This script must be run with root privileges." && exit
+# prepare build command
+readonly CMD="./build.sh -v -E $EDITION -T $TARGET $TALKING $CACHE -V $VERSION -o $OUT_DIR $*"
+
+
+# sanity checks
+((`id -u`)) && echo "This script must be run with root privileges." && exit || \
+               echo "Preparing (${MODE} mode): ${CMD}"
+
 
 # cleanup in case of previous aborted run
 while pids=$(pidof ./rebuild.sh || pidof sudo ./rebuild.sh) && pids=${pids/$PPID/} && [ "$pids" ]
@@ -34,6 +42,8 @@ do  declare -a mountpoints=()
     for mountpoint in ${mountpoints[@]} ; do umount "${mountpoint}" ; done ;
 done
 
+
+# prepare environment
 if   [ "$MODE" == 'wipe' ]
 then if [ "$PRESERVE_CACHE" == 'true' ]
      then for arch in i686 x86_64
@@ -69,10 +79,13 @@ then rm work/build.make_customize_root_image_$TARGET \
 fi
 
 
-CMD="./build.sh -v -E $EDITION -T $TARGET $TALKING $CACHE -V $VERSION $*"
+# start build
 if   ${CMD}
 then echo "success" ; rm ./continue.sh 2> /dev/null
-else echo -e "failure executing:\n\t${CMD}\ncontinue with:\n\t./continue.sh [args-to-build.sh]"
+else echo -e "failure executing:\n\t${CMD}\ncontinue with:\n\t./continue.sh [extra-args-to-build.sh]"
      echo -e "#!/bin/bash\n\n${CMD} \$*" > ./continue.sh
      chmod a+x ./continue.sh
 fi
+
+
+sudo chgrp -R wheel ./root-image/
diff --git a/configs/profile/root-image/root/customize_root_image.sh b/configs/profile/root-image/root/customize_root_image.sh
index 4ce914a..eda5c64 100755
--- a/configs/profile/root-image/root/customize_root_image.sh
+++ b/configs/profile/root-image/root/customize_root_image.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-### post-install chroot customization script ###
+## post-install chroot customization script ##
 
 set -e -u
 source /root/customize_root_image-constants.inc
@@ -35,9 +35,9 @@ then # delete files that are specific to other init systems
      # enable services
      for service in ${OPENRC_SERVICES} ; do rc-update add ${service} default ; done ;
 
-     # create the dbus user and group if it does not exist
-     if [[ "$(grep 'dbus' /etc/group )" = "" ]] ; then groupadd -g 81 dbus ; fi ;
-     if [[ "$(grep 'dbus' /etc/passwd)" = "" ]] ; then useradd -r -s /sbin/nologin -g 81 -u 81 dbus ; fi ;
+     # create the 'dbus' group and user if they do not exist
+     if ! grep 'dbus' /etc/group  > /dev/null ; then groupadd                          -g 81 dbus ; fi ;
+     if ! grep 'dbus' /etc/passwd > /dev/null ; then useradd -r -s /sbin/nologin -u 81 -g 81 dbus ; fi ;
 
 elif [[ "${ISO_INIT}" == 'systemd' ]]
 then # delete files that are specific to other init systems
@@ -76,7 +76,7 @@ else # configure GUI login session
 
      # configure live user
      [[ -n "$(id ${LIVE_USER} 2> /dev/null)" ]] && userdel -r ${LIVE_USER} 2> /dev/null
-     useradd -m -p "" -g users -G "${USER_GROUPS}" -s ${DEFAULT_SHELL} ${LIVE_USER}
+     useradd -m -p "" -g users -G "${LIVE_USER_GROUPS}" -s ${DEFAULT_SHELL} ${LIVE_USER}
 
      # configure auto-login
      if   [[ "${ISO_INIT}" == 'openrc' ]]
diff --git a/configs/profile/root-image/usr/share/parabola-laf/news/news-0 b/configs/profile/root-image/usr/share/parabola-laf/news/news-0
index 1039c82..25455cb 100644
--- a/configs/profile/root-image/usr/share/parabola-laf/news/news-0
+++ b/configs/profile/root-image/usr/share/parabola-laf/news/news-0
@@ -1,9 +1,7 @@
-This LiveISO is running the LXDE desktop environment that is as close as possible of an experience to a fully installed Parabola Operating System in its default configuration. Many other desktop environments are available after install. Use the "Install Parabola" desktop shortcut to begin the install.
+This LiveISO is running the LXDE desktop environment that is as close as possible of an experience to a fully installed Parabola Operating System in its standard graphical configuration. Many other desktop environments are available after install. Use the "Install Parabola" desktop shortcut to begin the install.
 
 Standard installation requires 9GB of disk space and 1GB RAM (or RAM plus swap space). Installation from the 'netinstall' ISOs requires an active connection to the internet; whereas the 'complete' ISOs contain everything necessary to install Parabola offline. The title of this window indicates the distinction.
 
 For computers with less than 1GB RAM, the command-line ~/install-openrc-lxde.sh and ~/install-systemd-mate.sh scripts are provided; either of which can be used to install either a minimal command-line system or a full graphical system.
 
-This is a beta preview release featuring the calamares graphical installer. As such, there may be some quirks with the appearance or behavior; but most normal functionality is expected to work properly.
-
 Please report any bugs that you may find to the Parabola "Installation Media" bug tracker using the "Report a Bug" desktop shortcut. If you have any other questions or comments, feel free to join the Parabola support chat using the "Parabola IRC Channel" desktop shortcut.