trustbridge: packaging/linux-installer.inc.in comparison

Factored out recursive deletion of empty dirs.

author	Sascha Wilde <wilde@intevation.de>
date	Thu, 03 Jul 2014 10:43:39 +0200
parents	feaabee15e72
children	efc2d16ab514

comparison

equal deleted inserted replaced

-:feaabee15e72
+:2d64ff7e22e8
 if [ $SYSINST -eq 1 -a "$UID" -ne 0 ] ; then
 fatal "System wide installation requires root privileges!"
 fi
 }
+rm_empty_dirs()
+{
+# Args: $1 - DIRECTORY
+#
+# Recursively remove DIRECTORY and all it _parent_ directories as
+# long as they are empty.
+local directory="$1"
+while [ "$directory" -a -z "$(ls -A "$directory")" ] ; do
+echo "Deleting empty directory '$directory' ..."
+rmdir "$directory"
+directory=`dirname "$directory"`
+done
+}
 deinstall_certs()
 {
 local cinst="${oldinstcfg[PREFIX]}/bin/cinst"
 local certlist=`ls -1  ${instdata_path}/list-*.txt | sort -nr | head -n 1`
 echo "Uninstalling certificates ..."
 if [ "$certlist" ] ; then
 echo "Using certificate list '$certlist'."
 if [ -x "$cinst" ] ; then
 "$cinst" "list=$certlist" "choices=uninstall"
 else
 for file in $BINNAMES ; do
 local path="${deinstdir}/$file"
 echo "Deleting '$path' ..."
 rm "$path" || echo >&2 "WARNING: Could not delete: '$path'!"
 done
-while [ "$deinstdir" -a -z "$(ls -A "$deinstdir")" ] ; do
+rm_empty_dirs "$deinstdir"
-echo "Deleting empty directory '$deinstdir' ..."
-rmdir "$deinstdir"
-deinstdir=`dirname "$deinstdir"`
-done
 echo "Removing installation configuration from: $instcfg_file ..."
 rm "$instcfg_file"
 echo "Deinstallation finished."
 else
 echo "No current installation found!  No harm done."

Mercurial > trustbridge