From 4c1f671767078c348494c71a079207c212307a45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Wed, 27 Mar 2013 17:58:20 +0100 Subject: [PATCH] remove AUTO-GENERATED desura pre-launch wrapper scripts *self-slap* --- packaging/linux/buildpackage.sh | 7 +++---- packaging/linux/desura_launch_Editor.sh | 24 ------------------------ packaging/linux/desura_launch_Play.sh | 24 ------------------------ 3 files changed, 3 insertions(+), 52 deletions(-) delete mode 100755 packaging/linux/desura_launch_Editor.sh delete mode 100755 packaging/linux/desura_launch_Play.sh diff --git a/packaging/linux/buildpackage.sh b/packaging/linux/buildpackage.sh index 951bbab23c..4d6228b0cf 100644 --- a/packaging/linux/buildpackage.sh +++ b/packaging/linux/buildpackage.sh @@ -22,9 +22,8 @@ cp -T openra-editor-bin $ROOTDIR/usr/bin/openra-editor mkdir -p $ROOTDIR/usr/share/openra/ cp -R $BUILTDIR/* "$ROOTDIR/usr/share/openra/" || exit 3 -# Desura launch scripts +# Launch scripts (executed by Desura) cp ../../*.sh "$ROOTDIR/usr/share/openra/" || exit 3 -cp desura* "$ROOTDIR/usr/share/openra/" || exit 3 # Desktop Icons mkdir -p $ROOTDIR/usr/share/applications/ @@ -50,7 +49,7 @@ cp -r hicolor $ROOTDIR/usr/share/icons/ echo "Arch-Linux package build failed, refer to $PWD/package.log." fi ) & - + ( echo "Building RPM package." cd rpm @@ -59,6 +58,6 @@ cp -r hicolor $ROOTDIR/usr/share/icons/ echo "RPM package build failed, refer to $PWD/package.log." fi ) & - + wait diff --git a/packaging/linux/desura_launch_Editor.sh b/packaging/linux/desura_launch_Editor.sh deleted file mode 100755 index 9806cf8ff7..0000000000 --- a/packaging/linux/desura_launch_Editor.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -cd "`dirname "\`readlink -f "$0"\`"`" - -if [ -e "desura_prelaunch.sh" ]; then - . desura_prelaunch.sh -fi - -BIN_PATH="$HOME/.desura/games/openra/launch-editor.sh" -ARGS= -# TODO: This is crap. -libSDL_Path="$HOME/.desura/tools/63/" -libopenal_Path="$HOME/.desura/tools/73/" -libCgGL_PATH="$HOME/.desura/tools/78/" -libCg_PATH="$HOME/.desura/tools/79/" -libfreetype_Path="$HOME/.desura/tools/92/" -libGLU_Path="$HOME/.desura/tools/93/" -libalut_Path="$HOME/.desura/tools/195/" - -if [ -n $ARGS ]; then - LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${libSDL_Path}:${libopenal_Path}:${libCgGL_PATH}:${libCg_PATH}:${libfreetype_Path}:${libGLU_Path}:${libalut_Path} ${BIN_PATH} ${ARGS} $@ -else - LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${libSDL_Path}:${libopenal_Path}:${libCgGL_PATH}:${libCg_PATH}:${libfreetype_Path}:${libGLU_Path}:${libalut_Path} ${BIN_PATH} $@ -fi \ No newline at end of file diff --git a/packaging/linux/desura_launch_Play.sh b/packaging/linux/desura_launch_Play.sh deleted file mode 100755 index 7420c915e1..0000000000 --- a/packaging/linux/desura_launch_Play.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -cd "`dirname "\`readlink -f "$0"\`"`" - -if [ -e "desura_prelaunch.sh" ]; then - . desura_prelaunch.sh -fi - -BIN_PATH="$HOME/.desura/games/openra/launch-game.sh" -ARGS= -# TODO: This is crap. -libSDL_Path="$HOME/.desura/tools/63/" -libopenal_Path="$HOME/.desura/tools/73/" -libCgGL_PATH="$HOME/.desura/tools/78/" -libCg_PATH="$HOME/.desura/tools/79/" -libfreetype_Path="$HOME/.desura/tools/92/" -libGLU_Path="$HOME/.desura/tools/93/" -libalut_Path="$HOME/.desura/tools/195/" - -if [ -n $ARGS ]; then - LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${libSDL_Path}:${libopenal_Path}:${libCgGL_PATH}:${libCg_PATH}:${libfreetype_Path}:${libGLU_Path}:${libalut_Path} ${BIN_PATH} ${ARGS} $@ -else - LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${libSDL_Path}:${libopenal_Path}:${libCgGL_PATH}:${libCg_PATH}:${libfreetype_Path}:${libGLU_Path}:${libalut_Path} ${BIN_PATH} $@ -fi \ No newline at end of file