[SSPS] Rudimentary package install retrying, bugfix

1 files changed, 32 insertions, 9 deletions

diff --git a/satellit_installer/includes/10-install_packages.inc b/satellit_installer/includes/10-install_packages.inc
index 2201b64..5ec8e71 100755
--- a/satellit_installer/includes/10-install_packages.inc
+++ b/satellit_installer/includes/10-install_packages.inc
@@ -1,5 +1,36 @@
 #!/bin/bash
 
+install_package() {
+	# These stacked ifs are just a stopgap until proper trapping.
+	echo -n "# Installing package $PACKAGE... "
+	apt-get -qq -y install ${PACKAGE} 2>/dev/null 1>&2
+	ERR=$?
+	if [ "$ERR" -ne 0 ]; then
+		echo
+		echo "# Could not install package $PACKAGE - Error number $ERR!"
+		echo -n "# Trying an apt-get update..."
+		apt-get update 2>/dev/null 1>&2
+		ERR=$?
+		if [ "$ERR" -ne 0 ]; then
+			echo
+			echo "# apt-get update has thrown error number $ERR. You need to take care"
+			echo "# of this by hand. Commencing installation."
+		else
+			echo " ok."
+			echo -n "# Retrying installing package $PACKAGE... "
+			apt-get -qq -y install ${PACKAGE} 2>/dev/null 1>&2
+			ERR=$?
+			if [ "$ERR" -ne 0 ]; then
+				echo "Could not install $PACKAGE. Giving up."
+			else
+				echo "ok."
+			fi
+		fi
+	else
+		echo "ok."
+	fi
+}
+
 install_packages() {
 	local NEEDED_PACKAGES="$1"
 
@@ -7,15 +38,7 @@ install_packages() {
 	echo "# Installing packages. This may take a while."
 	echo "#"
 	for PACKAGE in $NEEDED_PACKAGES; do
-		echo -n "# Installing package $PACKAGE... "
-		apt-get -qq -y install ${PACKAGE} 2>/dev/null 1>&2
-		ERR=$?
-		if [ "$ERR" -ne 0 ]; then
-			echo "# Could not install package $PACKAGE!"
-			# Weitere Fehlerbehandlung folgt
-		else
-			echo "ok."
-		fi
+		install_package
 	done
 }