Merge branch 'master' of simonslx:openslx-ng/tm-scripts

2 files changed, 15 insertions, 12 deletions

diff --git a/remote/modules/german/german.build b/remote/modules/german/german.build
index c8795254..cd68f009 100644
--- a/remote/modules/german/german.build
+++ b/remote/modules/german/german.build
@@ -10,10 +10,10 @@ build() {
 		locale-gen || perror "Could not generate locales (debian style)"
 	fi
 	# Ubuntu's version
-	if [ -d "/var/lib/locales/supported.d" ] && ! grep -q -E -r '^\s*de_DE\.UTF-8' "/var/lib/locales/supported.d"; then
+	if [ -d "/var/lib/locales/supported.d" ] && [ ! -d /usr/lib/locale/de_DE.utf8 ]; then
 		pinfo "Generating locales..."
-		echo 'de_DE.UTF-8 UTF-8' >> "/var/lib/locales/supported.d/openslx"
-		locale-gen "de_DE.UTF-8" || perror "Could not generate locales (ubuntu style)"
+		grep -q -E -r '^\s*de_DE\.UTF-8' "/var/lib/locales/supported.d" || echo 'de_DE.UTF-8 UTF-8' >> "/var/lib/locales/supported.d/openslx"
+		locale-gen --no-archive --purge "de_DE.UTF-8" || perror "Could not generate locales (ubuntu style)"
 	fi
 
 	# Put everything we build or get from the system in build dir
diff --git a/remote/modules/vmchooser/vmchooser.build b/remote/modules/vmchooser/vmchooser.build
index 9a9d6d63..0e68eea1 100644
--- a/remote/modules/vmchooser/vmchooser.build
+++ b/remote/modules/vmchooser/vmchooser.build
@@ -11,17 +11,20 @@ build() {
 	cd "${MODULE_BUILD_DIR}/${REQUIRED_PREFIX}"
 
 	# patch globals.cpp and globals.h to use standardised paths /opt/openslx/...
-	sed -i 's/^#define VMCHOOSER_BIN_PATH.*/#define VMCHOOSER_BIN_PATH "\/opt\/openslx\/bin"/g' "${SRCDIR}"/src/globals.h
-	sed -i 's/^#define VMCHOOSER_ETC_BASE_PATH.*/#define VMCHOOSER_ETC_BASE_PATH "\/opt\/openslx\/etc\/vmchooser"/g' "${SRCDIR}"/src/globals.h
-	sed -i 's/^#define VMCHOOSER_BIN_PATH.*/#define VMCHOOSER_BIN_PATH "\/opt\/openslx\/bin"\n#define VMCHOOSER_SCRIPTS_PATH "\/opt\/openslx\/scripts"/g' "${SRCDIR}"/src/globals.h
-	sed -i 's/^#define VMCHOOSER_THEME_BASE.*/#define VMCHOOSER_THEME_BASE "\/opt\/openslx\/usr\/share\/vmchooser\/themes"/g' "${SRCDIR}"/src/globals.h
-
-	sed -i 's/^QString binPath(VMCHOOSER_BIN_PATH);/QString binPath(VMCHOOSER_BIN_PATH);\nQString scriptsPath(VMCHOOSER_SCRIPTS_PATH);/g' "${SRCDIR}"/src/globals.cpp
-	sed -i 's/^QString runVmScript(binPath + "\/run-virt.sh");/QString runVmScript(scriptsPath + "\/vmchooser-run_virt");/g' "${SRCDIR}"/src/globals.cpp
-	sed -i 's/^QString filterScript(binPath + "\/xmlfilter.sh");/QString filterScript(scriptsPath + "\/vmchooser-xml_filter");/g' "${SRCDIR}"/src/globals.cpp
-	sed -i 's/^#define VMCHOOSER_VMPATH.*/#define VMCHOOSER_VMPATH "\/mnt\/vmstore"/g' "${SRCDIR}"/src/globals.h
+	if ! grep -q VMCHOOSER_SCRIPTS_PATH "$SRCDIR/src/globals.h"; then
+		sed -i 's/^#define VMCHOOSER_BIN_PATH.*/#define VMCHOOSER_BIN_PATH "\/opt\/openslx\/bin"/g' "${SRCDIR}"/src/globals.h
+		sed -i 's/^#define VMCHOOSER_ETC_BASE_PATH.*/#define VMCHOOSER_ETC_BASE_PATH "\/opt\/openslx\/etc\/vmchooser"/g' "${SRCDIR}"/src/globals.h
+		sed -i 's/^#define VMCHOOSER_BIN_PATH.*/#define VMCHOOSER_BIN_PATH "\/opt\/openslx\/bin"\n#define VMCHOOSER_SCRIPTS_PATH "\/opt\/openslx\/scripts"/g' "${SRCDIR}"/src/globals.h
+		sed -i 's/^#define VMCHOOSER_THEME_BASE.*/#define VMCHOOSER_THEME_BASE "\/opt\/openslx\/usr\/share\/vmchooser\/themes"/g' "${SRCDIR}"/src/globals.h
+	
+		sed -i 's/^QString binPath(VMCHOOSER_BIN_PATH);/QString binPath(VMCHOOSER_BIN_PATH);\nQString scriptsPath(VMCHOOSER_SCRIPTS_PATH);/g' "${SRCDIR}"/src/globals.cpp
+		sed -i 's/^QString runVmScript(binPath + "\/run-virt.sh");/QString runVmScript(scriptsPath + "\/vmchooser-run_virt");/g' "${SRCDIR}"/src/globals.cpp
+		sed -i 's/^QString filterScript(binPath + "\/xmlfilter.sh");/QString filterScript(scriptsPath + "\/vmchooser-xml_filter");/g' "${SRCDIR}"/src/globals.cpp
+		sed -i 's/^#define VMCHOOSER_VMPATH.*/#define VMCHOOSER_VMPATH "\/mnt\/vmstore"/g' "${SRCDIR}"/src/globals.h
+	fi
 
 	pinfo "Running cmake"
+	ln -sf qt4.conf /usr/share/qtchooser/default.conf
 	cmake "$SRCDIR" || perror "'cmake $SRCDIR' failed."
 	make || perror "'make' failed."