Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts

8 files changed, 142 insertions, 6 deletions

diff --git a/server/configs/freiburg/plymouth-freiburg b/server/configs/freiburg/plymouth-freiburg
new file mode 120000
index 00000000..8a14eb6a
--- /dev/null
+++ b/server/configs/freiburg/plymouth-freiburg
@@ -0,0 +1 @@
+../../modules/plymouth-freiburg
\ No newline at end of file
diff --git a/server/export_target b/server/export_target
index 3bda2ce6..e74db2d3 100755
--- a/server/export_target
+++ b/server/export_target
@@ -35,10 +35,6 @@ initial_checks() {
 
 	[ -d "${SERVER_BOOT_DIR}" ] || mkdir -p "${SERVER_BOOT_DIR}"
 
-	# check if SERVER_EXPORT_TARGET is valid
-	[ ! -z "${SERVER_EXPORT_CONFIG}" ] || perror "Server export config not given!"
-	[ -d "${SERVER_CONFIGS_DIR}/${SERVER_EXPORT_CONFIG}" ] || \
-		perror "Given export config not found: ${SERVER_CONFIGS_DIR}/${SERVER_EXPORT_CONFIG}"
 }
 
 copy_kernel() {
@@ -90,6 +86,11 @@ generate_config() {
 	local TOOL_STR="${TOOL_STR} generate_config:"
 	pinfo "Generating config.tgz for '${SERVER_CONFIG_TYPE}'"
 
+	# check if SERVER_EXPORT_TARGET is valid
+	[ ! -z "${SERVER_CONFIG_TYPE}" ] || perror "Server export config not given!"
+	[ -d "${SERVER_CONFIGS_DIR}/${SERVER_CONFIG_TYPE}" ] || \
+		perror "Given export config not found: ${SERVER_CONFIGS_DIR}/${SERVER_CONFIG_TYPE}"
+
 	# directory where the activated modules are given
 	# ex: server/configs/freiburg/
 	local TARGET_CONFIG_DIR="${SERVER_CONFIGS_DIR}/${SERVER_CONFIG_TYPE}"
@@ -115,7 +116,7 @@ generate_config() {
 		cd "${TARGET_CONFIG_DIR}/${MODULE_CONFIG}" || perror "\tCould not cd to '${TARGET_CONFIG_DIR}/${MODULE_CONFIG}'"
 
 		# check if files are already in another module config
-		for FILE in $(find . -type f); do
+		for FILE in $(find . -type f | cut -c 3-); do
 			# check for all the archives we find in TARGET_CONFIG_BUILD_DIR
 			for ARCHIV in $(ls "${TARGET_CONFIG_BUILD_DIR}/"*.tar 2>/dev/null); do
 				if [ "x$(tar tvf "${ARCHIV}" | grep "$FILE")" != "x" ]; then
@@ -130,9 +131,10 @@ generate_config() {
 		done
 
 		# no conflict, add file to archive
+		pinfo "${TARGET_CONFIG_BUILD_DIR}/${MODULE_CONFIG}.tar"
 		tar cf "${TARGET_CONFIG_BUILD_DIR}/${MODULE_CONFIG}.tar" $(ls)
 		RET=$?
-		[ "x$RET" != "x0" ] && perror "\tCould not create '${TARGET_CONFIG_BUILD_DIR}/${MODULE_CONFIG}.tgz'"
+		[ "x$RET" != "x0" ] && perror "\tCould not create '${TARGET_CONFIG_BUILD_DIR}/${MODULE_CONFIG}.tar'"
 	done
 
 	# now we have packed all configs separately and can concatenate them all together.
diff --git a/server/modules/plymouth-freiburg/share/plymouth/themes/default.plymouth b/server/modules/plymouth-freiburg/share/plymouth/themes/default.plymouth
new file mode 100644
index 00000000..8499e451
--- /dev/null
+++ b/server/modules/plymouth-freiburg/share/plymouth/themes/default.plymouth
@@ -0,0 +1,8 @@
+[Plymouth Theme]
+Name=Uni-Freiburg Basic Theme
+Description=Uni-Freiburg simple blue-ish theme with simple progress bar
+ModuleName=script
+
+[script]
+ImageDir=/share/plymouth/themes/unifr-rz
+ScriptFile=/share/plymouth/themes/unifr-rz/unifr-rz.script
diff --git a/server/modules/plymouth-freiburg/share/plymouth/themes/unifr-rz/rz_banner_trans.png b/server/modules/plymouth-freiburg/share/plymouth/themes/unifr-rz/rz_banner_trans.png
new file mode 100644
index 00000000..9cb68040
--- /dev/null
+++ b/server/modules/plymouth-freiburg/share/plymouth/themes/unifr-rz/rz_banner_trans.png
diff --git a/server/modules/plymouth-freiburg/share/plymouth/themes/unifr-rz/rz_logo_trans.png b/server/modules/plymouth-freiburg/share/plymouth/themes/unifr-rz/rz_logo_trans.png
new file mode 100644
index 00000000..16b069cc
--- /dev/null
+++ b/server/modules/plymouth-freiburg/share/plymouth/themes/unifr-rz/rz_logo_trans.png
diff --git a/server/modules/plymouth-freiburg/share/plymouth/themes/unifr-rz/unifr-rz.plymouth b/server/modules/plymouth-freiburg/share/plymouth/themes/unifr-rz/unifr-rz.plymouth
new file mode 100644
index 00000000..0f300f6b
--- /dev/null
+++ b/server/modules/plymouth-freiburg/share/plymouth/themes/unifr-rz/unifr-rz.plymouth
@@ -0,0 +1,9 @@
+[Plymouth Theme]
+Name=Simple RZ Theme
+Description=Simple blue RZ theme with progress bar.
+ModuleName=script
+
+[script]
+ImageDir=/lib/plymouth/themes/unifr-rz
+ScriptFile=/lib/plymouth/themes/unifr-rz/unifr-rz.script
+
diff --git a/server/modules/plymouth-freiburg/share/plymouth/themes/unifr-rz/unifr-rz.script b/server/modules/plymouth-freiburg/share/plymouth/themes/unifr-rz/unifr-rz.script
new file mode 100644
index 00000000..f2d8bd28
--- /dev/null
+++ b/server/modules/plymouth-freiburg/share/plymouth/themes/unifr-rz/unifr-rz.script
@@ -0,0 +1,116 @@
+Window.SetBackgroundTopColor(0.00, 0.21, 0.57);
+#Window.SetBackgroundBottomColor(0.00, 0.17, 0.95);
+
+title_left_image = Image("rz_banner_trans.png");
+title_right_image = Image("rz_logo_trans.png");
+title_left_sprite = Sprite(title_left_image);
+title_right_sprite = Sprite(title_right_image);
+
+title_right_sprite.SetX(Window.GetWidth() - title_right_image.GetWidth());
+
+dot.image = Image("white_dot_small.png");
+dot.sprite1 = Sprite(dot.image);
+dot.sprite2 = Sprite(dot.image);
+dot.sprite3 = Sprite(dot.image);
+dot.sprite4 = Sprite(dot.image);
+dot.sprite5 = Sprite(dot.image);
+
+#----------------------------------------- Progress Dots --------------------------------
+
+dot.x = Window.GetWidth()  / 2 - dot.image.GetWidth() / 2;
+dot.y = Window.GetHeight() * 0.75 - dot.image.GetHeight() / 2;
+dot.spacing = Window.GetWidth() / 15;
+
+# place 5 centered dots
+dot.sprite1.SetPosition(dot.x - 2 * dot.spacing, dot.y, 1);
+dot.sprite2.SetPosition(dot.x - dot.spacing, dot.y, 1);
+dot.sprite3.SetPosition(dot.x, dot.y, 1);
+dot.sprite4.SetPosition(dot.x + dot.spacing, dot.y, 1);
+dot.sprite5.SetPosition(dot.x + 2 * dot.spacing, dot.y, 1);
+
+# set opacity
+dot.sprite1.SetOpacity(0.1);
+dot.sprite2.SetOpacity(0.1);
+dot.sprite3.SetOpacity(0.1);
+dot.sprite4.SetOpacity(0.1);
+dot.sprite5.SetOpacity(0.1);
+
+fun progress_callback (duration, progress)
+  {
+    phase = Math.Int(duration * 2) % 10;
+
+    if ( phase == 1 )
+	{ 
+		fade_out(dot.sprite5);
+		fade_in(dot.sprite1);
+	}
+
+    if ( phase == 2 )
+	{ 
+		fade_out(dot.sprite1);
+		fade_in(dot.sprite2);
+	}
+
+    if ( phase == 3 )
+	{ 
+		fade_out(dot.sprite2);
+		fade_in(dot.sprite3);
+	}
+
+    if ( phase == 4 )
+	{ 
+		fade_out(dot.sprite3);
+		fade_in(dot.sprite4);
+	}
+
+    if ( phase == 5 )
+	{ 
+		fade_out(dot.sprite4);
+		fade_in(dot.sprite5);
+	}
+
+    if ( phase == 6 )
+	{ 
+		fade_out(dot.sprite5);
+		fade_in(dot.sprite1);
+	}
+
+    if ( phase == 7 )
+	{ 
+		fade_out(dot.sprite1);
+		fade_in(dot.sprite2);
+	}
+
+    if ( phase == 8 )
+	{
+		fade_out(dot.sprite2);
+		fade_in(dot.sprite3);
+	}
+
+    if ( phase == 9 )
+	{ 
+		fade_out(dot.sprite3);
+		fade_in(dot.sprite4);
+	}
+
+    if ( phase == 0 )
+	{ 
+		fade_out(dot.sprite4);
+		if ( Math.Int(duration) > 0 ) 
+		  { fade_in(dot.sprite5); }
+	}
+  }
+
+fun fade_in(sprite)
+{
+  if ( sprite.GetOpacity() + 0.1 < 1 )
+    { sprite.SetOpacity(sprite.GetOpacity() + 0.1);}
+}
+
+fun fade_out(sprite)
+{
+  if ( sprite.GetOpacity() - 0.1 > 0.1 )
+    { sprite.SetOpacity(sprite.GetOpacity() - 0.1);}
+}
+
+Plymouth.SetBootProgressFunction(progress_callback);
diff --git a/server/modules/plymouth-freiburg/share/plymouth/themes/unifr-rz/white_dot_small.png b/server/modules/plymouth-freiburg/share/plymouth/themes/unifr-rz/white_dot_small.png
new file mode 100644
index 00000000..4fd4be30
--- /dev/null
+++ b/server/modules/plymouth-freiburg/share/plymouth/themes/unifr-rz/white_dot_small.png