From c78e1a833ab8517fa672f226cb6766c53a977ae6 Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Thu, 12 Nov 2015 16:09:03 +0100
Subject: [SSPS] Some stupid bug.

---
 satellit_installer/satellit_installer | 39 ++++++++++++++---------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

(limited to 'satellit_installer/satellit_installer')

diff --git a/satellit_installer/satellit_installer b/satellit_installer/satellit_installer
index 859c28b..57de18d 100755
--- a/satellit_installer/satellit_installer
+++ b/satellit_installer/satellit_installer
@@ -44,7 +44,7 @@ while [ -n "$1" ]; do
 			export VERSION="$1"
 			shift
 			;;
-		"-d" | "--delete")
+		"-n" | "--nodelete")
 			NODELETE_SOURCE="true"
 			shift
 			;;
@@ -57,7 +57,7 @@ done
 
 # Some version string sanity checks:
 [ -z "$VERSION" ] && { echo "No version string has been given - exit."; exit 1; }
-[ ${VERSION:0:1} = "-" ] && { echo "Possibly no version string has been given - exit."; exit 1; }
+[ "${VERSION:0:1}" = '-' ] && { echo "Possibly no version string has been given - exit."; exit 1; }
 
 # Set and save some environmental variables:
 OLDUMASK=$(umask)
@@ -82,9 +82,9 @@ echo " ok"
 ####### Main program #######
 
 system_upgrade					# No harm done even if not necessary
-
+ 
 install_packages "$PACKAGELIST_SCRIPT"		# Packages needed for script
-
+ 
 # Then, let's download the needed helper files to static_files, as there
 # is no sense in commencing if one of these files is missing.
 get_files_http
@@ -170,30 +170,23 @@ drop_firstrun_script
 
 install_slxlog
 install_finalize	# Script for cleaning some stuff after installation
+# 
+# set_directory_permissions
+# 
+# # Remove translation from menu etc.
+# patch_slxadmin
+# 
+# tar -z -c -T /dev/null -f /opt/openslx/empty.tgz
+# 
+# # Mark vmstore as not mounted
+# touch "/srv/openslx/nfs/.notmounted"
 
-set_directory_permissions
-
-# Remove translation from menu etc.
-patch_slxadmin
-
-tar -z -c -T /dev/null -f /opt/openslx/empty.tgz
-
-# Mark vmstore as not mounted
-touch "/srv/openslx/nfs/.notmounted"
-
-# Activate 'purge_install' here - but be careful! This is for debugging purposes only!
-# purge_install
-
-# cleaning log files, authorized hosts
+# cleaning log files, authorized hosts, sources
 clean_install
 end_message
 
 finalize		# Cleaning script; finalize script will delete itself.
 
-# cleaning log files, authorized hosts, sources
-clean_install
-end_message
-
-[ NODELETE_SOURCE = "true" ] && { echo "#"; echo "# Deleting source directory..."; rm -rf "$BASEDIR"; echo "# done." }
+[ "$NODELETE_SOURCE" = "true" ] && { echo "#"; echo "# Deleting source directory..."; rm -rf "$BASEDIR"; echo "# done."; }
 
 exit 0
-- 
cgit v1.2.3-55-g7522