[vmchooser] Change path specs

17 files changed, 2 insertions, 2 deletions

diff --git a/remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/smb.conf b/remote/modules/vmchooser/data/opt/openslx/vmchooser/config/smb.conf
index ec757ce4..ec757ce4 100644
--- a/remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/smb.conf
+++ b/remote/modules/vmchooser/data/opt/openslx/vmchooser/config/smb.conf
diff --git a/remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/vmchooser.conf b/remote/modules/vmchooser/data/opt/openslx/vmchooser/config/vmchooser.conf
index 203f125b..203f125b 100644
--- a/remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/vmchooser.conf
+++ b/remote/modules/vmchooser/data/opt/openslx/vmchooser/config/vmchooser.conf
diff --git a/remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/openslx.exe b/remote/modules/vmchooser/data/opt/openslx/vmchooser/data/openslx.exe
index e016f407..e016f407 100755
--- a/remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/openslx.exe
+++ b/remote/modules/vmchooser/data/opt/openslx/vmchooser/data/openslx.exe
diff --git a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool-left.png b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/bwlehrpool/bwlehrpool-left.png
index c9d8ab0d..c9d8ab0d 100644
--- a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool-left.png
+++ b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/bwlehrpool/bwlehrpool-left.png
diff --git a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool-right.png b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/bwlehrpool/bwlehrpool-right.png
index 8ca9347b..8ca9347b 100644
--- a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool-right.png
+++ b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/bwlehrpool/bwlehrpool-right.png
diff --git a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool.ini b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/bwlehrpool/bwlehrpool.ini
index 90d00617..90d00617 100644
--- a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool.ini
+++ b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/bwlehrpool/bwlehrpool.ini
diff --git a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx-left.png b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx-left.png
index 900dd867..900dd867 100644
--- a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx-left.png
+++ b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx-left.png
diff --git a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx-right.png b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx-right.png
index 8ca9347b..8ca9347b 100644
--- a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx-right.png
+++ b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx-right.png
diff --git a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx.ini b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx.ini
index 57a22821..57a22821 100644
--- a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx.ini
+++ b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx.ini
diff --git a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/planets/planets-left.png b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/planets/planets-left.png
index c8736b72..c8736b72 100644
--- a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/planets/planets-left.png
+++ b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/planets/planets-left.png
diff --git a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/planets/planets-right.png b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/planets/planets-right.png
index e21f0d8b..e21f0d8b 100644
--- a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/planets/planets-right.png
+++ b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/planets/planets-right.png
diff --git a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/planets/planets.ini b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/planets/planets.ini
index d9aa17f6..d9aa17f6 100644
--- a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/planets/planets.ini
+++ b/remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/planets/planets.ini
diff --git a/remote/modules/vmchooser/vmchooser.build b/remote/modules/vmchooser/vmchooser.build
index 0e68eea1..58f5986e 100644
--- a/remote/modules/vmchooser/vmchooser.build
+++ b/remote/modules/vmchooser/vmchooser.build
@@ -13,9 +13,9 @@ build() {
 	# patch globals.cpp and globals.h to use standardised paths /opt/openslx/...
 	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_ETC_BASE_PATH.*/#define VMCHOOSER_ETC_BASE_PATH "\/opt\/openslx\/vmchooser\/config"/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/^#define VMCHOOSER_THEME_BASE.*/#define VMCHOOSER_THEME_BASE "\/opt\/openslx\/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
diff --git a/server/modules/vmchooser-freiburg/opt/openslx/etc/vmchooser/vmchooser.conf b/server/modules/vmchooser-freiburg/opt/openslx/vmchooser/config/vmchooser.conf
index e436587e..e436587e 100644
--- a/server/modules/vmchooser-freiburg/opt/openslx/etc/vmchooser/vmchooser.conf
+++ b/server/modules/vmchooser-freiburg/opt/openslx/vmchooser/config/vmchooser.conf
diff --git a/server/modules/vmchooser-freiburg/opt/openslx/usr/share/vmchooser/themes/unifr/title_l.png b/server/modules/vmchooser-freiburg/opt/openslx/vmchooser/themes/unifr/title_l.png
index e602ccd1..e602ccd1 100644
--- a/server/modules/vmchooser-freiburg/opt/openslx/usr/share/vmchooser/themes/unifr/title_l.png
+++ b/server/modules/vmchooser-freiburg/opt/openslx/vmchooser/themes/unifr/title_l.png
diff --git a/server/modules/vmchooser-freiburg/opt/openslx/usr/share/vmchooser/themes/unifr/title_r.png b/server/modules/vmchooser-freiburg/opt/openslx/vmchooser/themes/unifr/title_r.png
index 3edbcb0c..3edbcb0c 100644
--- a/server/modules/vmchooser-freiburg/opt/openslx/usr/share/vmchooser/themes/unifr/title_r.png
+++ b/server/modules/vmchooser-freiburg/opt/openslx/vmchooser/themes/unifr/title_r.png
diff --git a/server/modules/vmchooser-freiburg/opt/openslx/usr/share/vmchooser/themes/unifr/unifr.ini b/server/modules/vmchooser-freiburg/opt/openslx/vmchooser/themes/unifr/unifr.ini
index dadcb4e1..dadcb4e1 100644
--- a/server/modules/vmchooser-freiburg/opt/openslx/usr/share/vmchooser/themes/unifr/unifr.ini
+++ b/server/modules/vmchooser-freiburg/opt/openslx/vmchooser/themes/unifr/unifr.ini