diff options
| -rw-r--r-- | remote/modules/vmchooser/data/opt/openslx/vmchooser/config/smb.conf (renamed from remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/smb.conf) | 0 | ||||
| -rw-r--r-- | remote/modules/vmchooser/data/opt/openslx/vmchooser/config/vmchooser.conf (renamed from remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/vmchooser.conf) | 0 | ||||
| -rwxr-xr-x | remote/modules/vmchooser/data/opt/openslx/vmchooser/data/openslx.exe (renamed from remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/openslx.exe) | bin | 12800 -> 12800 bytes | |||
| -rw-r--r-- | remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/bwlehrpool/bwlehrpool-left.png (renamed from remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool-left.png) | bin | 5361 -> 5361 bytes | |||
| -rw-r--r-- | remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/bwlehrpool/bwlehrpool-right.png (renamed from remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool-right.png) | bin | 3390 -> 3390 bytes | |||
| -rw-r--r-- | remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/bwlehrpool/bwlehrpool.ini (renamed from remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool.ini) | 0 | ||||
| -rw-r--r-- | remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx-left.png (renamed from remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx-left.png) | bin | 9187 -> 9187 bytes | |||
| -rw-r--r-- | remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx-right.png (renamed from remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx-right.png) | bin | 3390 -> 3390 bytes | |||
| -rw-r--r-- | remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx.ini (renamed from remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx.ini) | 0 | ||||
| -rw-r--r-- | remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/planets/planets-left.png (renamed from remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/planets/planets-left.png) | bin | 11337 -> 11337 bytes | |||
| -rw-r--r-- | remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/planets/planets-right.png (renamed from remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/planets/planets-right.png) | bin | 3082 -> 3082 bytes | |||
| -rw-r--r-- | remote/modules/vmchooser/data/opt/openslx/vmchooser/themes/planets/planets.ini (renamed from remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/planets/planets.ini) | 0 | ||||
| -rw-r--r-- | remote/modules/vmchooser/vmchooser.build | 4 | ||||
| -rw-r--r-- | server/modules/vmchooser-freiburg/opt/openslx/vmchooser/config/vmchooser.conf (renamed from server/modules/vmchooser-freiburg/opt/openslx/etc/vmchooser/vmchooser.conf) | 0 | ||||
| -rw-r--r-- | server/modules/vmchooser-freiburg/opt/openslx/vmchooser/themes/unifr/title_l.png (renamed from server/modules/vmchooser-freiburg/opt/openslx/usr/share/vmchooser/themes/unifr/title_l.png) | bin | 17458 -> 17458 bytes | |||
| -rw-r--r-- | server/modules/vmchooser-freiburg/opt/openslx/vmchooser/themes/unifr/title_r.png (renamed from server/modules/vmchooser-freiburg/opt/openslx/usr/share/vmchooser/themes/unifr/title_r.png) | bin | 4113 -> 4113 bytes | |||
| -rw-r--r-- | server/modules/vmchooser-freiburg/opt/openslx/vmchooser/themes/unifr/unifr.ini (renamed from server/modules/vmchooser-freiburg/opt/openslx/usr/share/vmchooser/themes/unifr/unifr.ini) | 0 |
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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 |
