Removed old doomrl script, quotized paths in doomrl.sh

4 files changed, 25 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4d2a36195772..d72fbbf490a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Aug 26 15:42:16 UTC 2016
+# Sat Aug 27 07:58:49 UTC 2016
 pkgbase = doomrl
 	pkgdesc = A roguelike game based on the FPS Doom.
 	pkgver = 0.9.9.7
-	pkgrel = 4
+	pkgrel = 5
 	url = http://doom.chaosforge.org/
 	arch = i686
 	arch = x86_64
@@ -13,13 +13,10 @@ pkgbase = doomrl
 	depends = lua
 	depends = timidity++
 	depends = sdl_image
-	conflicts = doomrl-lq doomrl-ogg
-	source = doomrl
 	source = LICENSE
 	source = doomrl.sh
-	sha256sums = ba6eb69db49e079f565f155047df2637aa8c36687699c109f36ac20a4be45068
 	sha256sums = fa626af2c45e10e5bce4d01b3e9d0451ffc96996408880b1be77f7a5956cdf9f
-	sha256sums = aa33db3ae113bf7b52f0e670e5fc341b4423c3e8de1c9737584426bacdd4781f
+	sha256sums = 106d0e32cdea95ccdc7345d10b33737cb6f458ac47315b8c4c1513a64bb9ccad
 	source_i686 = http://doom.chaosforge.org/file_download/33/doomrl-linux-i386-0997.tar.gz
 	sha256sums_i686 = 6d217d697e94f5f2ce3fe8ebbedaf03fa68a5ed1140cb889921f18d8604a389f
 	source_x86_64 = http://doom.chaosforge.org/file_download/32/doomrl-linux-x64-0997.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index b8e8e9b835f0..03e17df67931 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=doomrl
 pkgver=0.9.9.7
-pkgrel=4
+pkgrel=5
 pkgdesc="A roguelike game based on the FPS Doom."
 arch=('i686' 'x86_64')
 url="http://doom.chaosforge.org/"
@@ -16,15 +16,13 @@ depends=("sdl_mixer"
         "lua"
         "timidity++"
         "sdl_image")
-conflicts=("doomrl-lq doomrl-ogg")
 
-source=("doomrl" "LICENSE" "doomrl.sh")
+source=("LICENSE" "doomrl.sh")
 source_i686=("http://doom.chaosforge.org/file_download/33/doomrl-linux-i386-0997.tar.gz")
 source_x86_64=("http://doom.chaosforge.org/file_download/32/doomrl-linux-x64-0997.tar.gz")
 
-sha256sums=('ba6eb69db49e079f565f155047df2637aa8c36687699c109f36ac20a4be45068'
-            'fa626af2c45e10e5bce4d01b3e9d0451ffc96996408880b1be77f7a5956cdf9f'
-            'aa33db3ae113bf7b52f0e670e5fc341b4423c3e8de1c9737584426bacdd4781f')
+sha256sums=('fa626af2c45e10e5bce4d01b3e9d0451ffc96996408880b1be77f7a5956cdf9f'
+            '106d0e32cdea95ccdc7345d10b33737cb6f458ac47315b8c4c1513a64bb9ccad')
 sha256sums_i686=('6d217d697e94f5f2ce3fe8ebbedaf03fa68a5ed1140cb889921f18d8604a389f')
 sha256sums_x86_64=('d9d19e4a8794efb3c23963b3e11987ebadbb7bee7350b00ce6b64eaff501e488')
 
@@ -49,8 +47,5 @@ package() {
     # Copy the license file
     install -D -m644 "$srcdir/LICENSE" \
     "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-    # This is needed to save games and scores
-    #chmod 4755 "$pkgdir/usr/share/doomrl/doomrl"
 }
 
diff --git a/doomrl b/doomrl
deleted file mode 100644
index 82cab5f2adc6..000000000000
--- a/doomrl
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /bin/sh
-
-## This is required for savegames to work.
-cd /usr/share/doomrl
-/usr/share/doomrl/doomrl $1
-
diff --git a/doomrl.sh b/doomrl.sh
index 21171c62c681..95708c4a9571 100755
--- a/doomrl.sh
+++ b/doomrl.sh
@@ -3,25 +3,25 @@ export LD_LIBRARY_PATH=/usr/share/doomrl:$LD_LIBRARY_PATH
 dir=${XDG_DATA_HOME:-$HOME/.local/share}/doomrl
 bin=/usr/share/doomrl
 
-if [[ ! -d $dir ]]; then
-    mkdir -p $dir || exit 1
+if [[ ! -d "$dir" ]]; then
+    mkdir -p "$dir" || exit 1
 
-    cp $bin/log.txt $dir || :
-    cp $bin/error.log $dir || :
-    cp $bin/{core,doomrl,player,score}.wad $dir || :
-    cp $bin/{colors,config,keybindings,musichq,soundhq}.lua $dir || exit 1
-    cp $bin/doom.prc $dir || :
-    cp -r $bin/backup $dir || exit 1
-    cp -r $bin/modules $dir || exit 1
-    cp -r $bin/mortem $dir || exit 1
-    cp -r $bin/screenshot $dir || exit 1
+    cp $bin/log.txt "$dir" || :
+    cp $bin/error.log "$dir" || :
+    cp $bin/{core,doomrl,player,score}.wad "$dir" || :
+    cp $bin/{colors,config,keybindings,musichq,soundhq}.lua "$dir" || exit 1
+    cp $bin/doom.prc "$dir" || :
+    cp -r $bin/backup "$dir" || exit 1
+    cp -r $bin/modules "$dir" || exit 1
+    cp -r $bin/mortem "$dir" || exit 1
+    cp -r $bin/screenshot "$dir" || exit 1
 
-    ln -s $bin/doomrl $dir || exit 1
-    ln -s $bin/doomrl_{gnome-terminal,konsole,xterm} $dir || exit 1
-    ln -s $bin/{manual,unix_notes,version_api,version}.txt $dir || exit 1
-    ln -s $bin/mp3 $dir || exit 1
-    ln -s $bin/wavhq $dir || exit 1 
+    ln -s $bin/doomrl "$dir" || exit 1
+    ln -s $bin/doomrl_{gnome-terminal,konsole,xterm} "$dir" || exit 1
+    ln -s $bin/{manual,unix_notes,version_api,version}.txt "$dir" || exit 1
+    ln -s $bin/mp3 "$dir" || exit 1
+    ln -s $bin/wavhq "$dir" || exit 1 
 fi
 
-cd $dir
-exec $bin/doomrl
+cd "$dir"
+exec $bin/doomrl $1