Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master sorcery by Ismael Luceno <ismael AT sourcemage.org>:

 usr/sbin/delve                         |   42 
+++++++++++++--------------------
 var/lib/sorcery/modules/build_api/api2 |    6 ++--
 var/lib/sorcery/modules/libtrack       |    6 ----
 3 files changed, 21 insertions(+), 33 deletions(-)

New commits:
commit 36d011541c3ed7f760836837206f7d2854cb8fd1
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    delve: Refactor staged install setup

commit 09ade572b5cdab33037c22a58332e0f9f24ef709
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    libtrack: Simplify unmounting of castfs

commit 8094b28e2ca62af9ffb1250c1822ba10f8fa2def
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    api2: Simplify $STAGED_INSTALL + $HOST check

diff --git a/usr/sbin/delve b/usr/sbin/delve
index 7ecbc80..ded3e84 100755
--- a/usr/sbin/delve
+++ b/usr/sbin/delve
@@ -169,24 +169,27 @@ delve_pre_install() {
      > >(tee -a $C_LOG > $VOYEUR_STDOUT)
 }
 
+delve_staged_install_setup() {
+  case "$STAGED_INSTALL:$CHROOT_CHECK" in
+    (off:*) invoke_installwatch ;;
+    (*:)
+      if [ "x$1" = x--prepare ]; then
+        prepare_stage_root
+      fi &&
+      invoke_stage_root &&
+      export CHROOT_CHECK=true &&
+      CHROOT_CMD="chroot \"$STAGE_DIRECTORY\"/MOUNT"
+      ;&
+    (*:true) INSTALL_ROOT="" ;;
+  esac
+}
+
 delve_install() {
   debug "delve" "Running $FUNCNAME"
 
   delve_is_valid_step INSTALL 2 || return 1
   delve_log_helper
-  if [[ "$STAGED_INSTALL" != "off" ]]
-  then
-    if [[ -z "$CHROOT_CHECK" ]]
-    then
-      prepare_stage_root &&
-      invoke_stage_root &&
-      export CHROOT_CHECK="true"
-      CHROOT_CMD="chroot ${STAGE_DIRECTORY}/MOUNT"
-    fi
-    INSTALL_ROOT=""
-  else
-    invoke_installwatch
-  fi
+  delve_staged_install_setup --prepare
   (
     if [[ -z "$CHROOT_CMD" ]]
     then
@@ -210,18 +213,7 @@ delve_install_extras() {
 
   delve_is_valid_step INSTALL_EXTRAS 2 || return 1
   delve_log_helper
-  if [[ "$STAGED_INSTALL" != "off" ]]
-  then
-    if [[ -z "$CHROOT_CHECK" ]]
-    then
-      invoke_stage_root &&
-      export CHROOT_CHECK="true"
-      CHROOT_CMD="chroot ${STAGE_DIRECTORY}/MOUNT"
-    fi
-    INSTALL_ROOT=""
-  else
-    invoke_installwatch
-  fi
+  delve_staged_install_setup
   (
     if [[ -z "$CHROOT_CMD" ]]
     then
diff --git a/var/lib/sorcery/modules/build_api/api2 
b/var/lib/sorcery/modules/build_api/api2
index a2212a4..abfceea 100755
--- a/var/lib/sorcery/modules/build_api/api2
+++ b/var/lib/sorcery/modules/build_api/api2
@@ -372,11 +372,11 @@ real_default_sorcery_install_extras() {
   install_desktop_files
   gather_docs
   init_post_install
-  [[ $STAGED_INSTALL == off ]] &&
-  case "$HOST" in *-gnu) ldconfig;; esac
+  case "$STAGED_INSTALL:$HOST" in
+    (off:*-gnu) ldconfig ;;
+  esac
   # release_saved_libraries
   cd  /
-
 }
 
 real_default_sorcery_transfer() {
diff --git a/var/lib/sorcery/modules/libtrack 
b/var/lib/sorcery/modules/libtrack
index 2c02db4..641e250 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -124,11 +124,7 @@ real_devoke_stage_root()
 {
   unset CASTFS_LOGFILE
   unset CASTFS_DBGLVL
-  for dir in /dev/pts /dev /proc /sys
-  do
-    umount -l "${STAGE_DIRECTORY}/MOUNT$dir"
-  done &&
-  umount -l "${STAGE_DIRECTORY}/MOUNT"
+  umount -l "${STAGE_DIRECTORY}/MOUNT"{/dev/pts,/dev,/proc,/sys,}
 }
 
 #---------------------------------------------------------------------