From 91c37e5a817c3cc03aaeb25a6369f3f2d0fe2726 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 21 Dec 2017 11:17:48 +0100
Subject: [SSUS] Delete incomplete 'pt' translation; remove link to translation
 util; fix inverted logic for libjansson4 check

---
 satellit_upgrader/updater.template.sh | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'satellit_upgrader')

diff --git a/satellit_upgrader/updater.template.sh b/satellit_upgrader/updater.template.sh
index cb2503c..7d51cd7 100644
--- a/satellit_upgrader/updater.template.sh
+++ b/satellit_upgrader/updater.template.sh
@@ -272,8 +272,12 @@ if [ -n "$TGZ_SLXADMIN" ]; then
 			pwarning "slxadmin updater didn't finish with 'Done.'"
 		fi
 	)
-	# Delete old statistics api, dummy interface for calendar
-	rm -f -- "/srv/openslx/www/slx-admin/apis/statistics.inc.php" "/srv/openslx/www/slx-admin/modules-available/locationinfo/inc/coursebackend/coursebackend_dummy.inc.php"
+	# Delete old statistics api & unneeded dirs
+	rm -rf -- "${PATH_SLXADMIN}/apis/statistics.inc.php" "${PATH_SLXADMIN}/doc" "${PATH_SLXADMIN}/.idea" "${PATH_SLXADMIN}/tools" "${PATH_SLXADMIN}/.git"
+	# Since 90% is missing by now...
+	rm -rf -- "${PATH_SLXADMIN}/lang/pt"
+	# Remove link to translation util
+	sed -i '/<a.*lang_translations/d' "${PATH_SLXADMIN}/modules-available/main/templates/main-menu.html"
 
 	fixperms "$PATH_SLXADMIN" root:root
 	chmod 0640 "$PATH_SLXADMIN/config.php"
@@ -424,8 +428,8 @@ mkdir -p "$PATH_DNBD3" || perror "Could not create $PATH_DNBD3"
 if ! id -u dnbd3 &> /dev/null; then
 	dnbd3group=$(getent group dnbd3 2>/dev/null | cut -d ":" -f 3)
 	if [ -z "$dnbd3group" ]; then
-		echo "Creating dnbd3 group with gid $dnbd3group"
 		dnbd3group=10002
+		echo "Creating dnbd3 group with gid $dnbd3group"
 		groupadd -g "$dnbd3group" dnbd3 || perror "Could not add dnbd3 group!"
 		echo "Group added"
 	else
@@ -437,7 +441,7 @@ if ! id -u dnbd3 &> /dev/null; then
 	echo "User added"
 fi
 
-if dpkg -l | grep -q "^ii\\s.*$PACKAGE_LIBJANSSON"; then
+if ! dpkg -l | grep -q "^ii\\s.*$PACKAGE_LIBJANSSON"; then
 	echo "Installing $PACKAGE_LIBJANSSON"
 	if ! apt-get install -y "$PACKAGE_LIBJANSSON" &> "$TMPDIR/apt.log"; then
 		cat "$TMPDIR/apt.log"
@@ -455,15 +459,15 @@ fi
 
 # config
 if [ -e "$FILEDIR/server.conf" ]; then
-	echo "* Inserting server.conf (dnbd3)"
+	echo "Inserting server.conf (dnbd3)"
 	cp "$FILEDIR/server.conf" "/etc/dnbd3-server/server.conf" || perror "Could not write /etc/dnbd3-server/server.conf"
 fi
 if [ -e "$FILEDIR/is-enabled" ]; then
-	echo "* Inserting is-enabled to $PATH_DNBD3 (dnbd3)"
+	echo "Inserting is-enabled to $PATH_DNBD3 (dnbd3)"
 	cp "$FILEDIR/is-enabled" "$PATH_DNBD3/is-enabled" || perror "Could not write /opt/openslx/dnbd3/is-enabled"
 fi
 if [ -e "$FILEDIR/rpc.acl" ]; then
-	echo "* Inserting rpc.acl to $PATH_DNBD3 (dnbd3)"
+	echo "Inserting rpc.acl to $PATH_DNBD3 (dnbd3)"
 	cp "$FILEDIR/rpc.acl" "/etc/dnbd3-server/rpc.acl" || perror "Could not write /etc/dnbd3-server/rpc.acl"
 fi
 
-- 
cgit v1.2.3-55-g7522