Minor changes to conform recommendations.

3 files changed, 31 insertions, 93 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 323b4cf23dcb..7bc415d40e2a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Fri Jul 15 21:08:40 UTC 2016
 pkgbase = d2x-rebirth
-	pkgdesc = An enhanced engine to play with Descent2 datas
+	pkgdesc = An enhanced engine to play with Descent2 data.
 	pkgver = 0.58.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.dxx-rebirth.com/
 	install = d2x-rebirth.install
 	arch = i686
@@ -18,11 +20,9 @@ pkgbase = d2x-rebirth
 	noextract = d2xr-sc55-music.dxa
 	source = http://www.dxx-rebirth.com/download/dxx/d2x-rebirth_v0.58.1-src.tar.gz
 	source = d2x-rebirth.desktop
-	source = d2x-rebirth.install
 	source = http://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa
 	md5sums = 584187fdd922d732e47a64451085eaca
 	md5sums = 3771fe1979a98ed32e7a9c9be8aa80a6
-	md5sums = 6836b665ac0c67117c810de77ca5e739
 	md5sums = b5bd2bea4cf904d54bddad36222aa92f
 
 pkgname = d2x-rebirth
diff --git a/PKGBUILD b/PKGBUILD
index 0a799e133406..2c79fcb33bd1 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,42 @@
 # Contributor : zico <zico@dxx-rebirth.com>
+# Maintainer: SanskritFritz (gmail)
 
 pkgname=d2x-rebirth
 pkgver=0.58.1
-pkgrel=1
-pkgdesc="An enhanced engine to play with Descent2 datas"
+pkgrel=2
+pkgdesc="An enhanced engine to play with Descent2 data."
 arch=('i686' 'x86_64')
 url="http://www.dxx-rebirth.com/"
 license=('custom:D1x' 'LGPL' 'custom:as-is')
 depends=('sdl' 'sdl_mixer' 'mesa' 'physfs')
 makedepends=('scons' 'unzip')
 install=$pkgname.install
-source=(http://www.dxx-rebirth.com/download/dxx/${pkgname}_v${pkgver}-src.tar.gz $pkgname.desktop $pkgname.install http://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa)
-noextract=(d2xr-sc55-music.dxa)
+source=("http://www.dxx-rebirth.com/download/dxx/${pkgname}_v${pkgver}-src.tar.gz"
+        "$pkgname.desktop"
+        "http://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa")
+noextract=("d2xr-sc55-music.dxa")
 md5sums=('584187fdd922d732e47a64451085eaca'
          '3771fe1979a98ed32e7a9c9be8aa80a6'
-         '6836b665ac0c67117c810de77ca5e739'
          'b5bd2bea4cf904d54bddad36222aa92f')
 
+build() {
+	cd "$srcdir/${pkgname}_v${pkgver}-src"
+	sed -ie "/^PREFIX =/s|/usr/local/|/usr/|" SConstruct
+	scons sharepath="/usr/share/$pkgname"
+}
+
 package() {
-  cd $srcdir/${pkgname}_v${pkgver}-src
-  sed -ie "/^PREFIX =/s|/usr/local/|/usr/|" SConstruct
-  scons sharepath="/usr/share/$pkgname" || return 1
-  
-  mkdir -p $pkgdir/usr/bin/
-  mkdir -p $pkgdir/usr/share/$pkgname/
-  mkdir -p $pkgdir/usr/share/pixmaps/
-  mkdir -p $pkgdir/usr/share/applications/
-  mkdir -p $pkgdir/usr/share/licenses/$pkgname/
+	mkdir -p "$pkgdir/usr/bin/"
+	mkdir -p "$pkgdir/usr/share/$pkgname/"
+	mkdir -p "$pkgdir/usr/share/pixmaps/"
+	mkdir -p "$pkgdir/usr/share/applications/"
+	mkdir -p "$pkgdir/usr/share/licenses/$pkgname/"
+
+	cd "$srcdir/${pkgname}_v${pkgver}-src"
+	install -m755 "$pkgname" "$pkgdir/usr/bin/"
 
-  install -m755 $pkgname $pkgdir/usr/bin/
-  cd $srcdir/
-  install -m644 $srcdir/${pkgname}_v${pkgver}-src/$pkgname.xpm $pkgdir/usr/share/pixmaps/
-  install -m644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/
-  install -m644 $srcdir/${pkgname}_v${pkgver}-src/COPYING.txt $pkgdir/usr/share/licenses/$pkgname/
-  install -m644 d2xr-sc55-music.dxa $pkgdir/usr/share/$pkgname/
+	install -m644 "$srcdir/${pkgname}_v${pkgver}-src/$pkgname.xpm" "$pkgdir/usr/share/pixmaps/"
+	install -m644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/"
+	install -m644 "$srcdir/${pkgname}_v${pkgver}-src/COPYING.txt" "$pkgdir/usr/share/licenses/$pkgname/"
+	install -m644 "$srcdir/d2xr-sc55-music.dxa" "$pkgdir/usr/share/$pkgname/"
 } 
diff --git a/d2x-rebirth.install b/d2x-rebirth.install
index 4ac737bab015..01e1e54803d5 100755
--- a/d2x-rebirth.install
+++ b/d2x-rebirth.install
@@ -1,74 +1,8 @@
 post_install() {
-  function install_datas() {
-  read -p "I'm about to install Descent 2 datas to /usr/share/d2x-rebirth/, would you like to continue (Y/n) ? "
-  case $REPLY in
-    n|N) return 1;;
-  esac
 
-  type unarj &> /dev/null
-  if (($?)); then
-    echo 'I need unarj to continue';
-    read -p 'Do you want install it (Y/n) ? '
-    case $REPLY in
-      n|N) return 1;;
-    esac
-    pacman -Sy unarj || return 2
-  fi
-  
-  cont=1
-  while (($cont)); do
-  echo 'Give me the complete path to "descent2.sow" file (example, with the cd drive : /path/to/drive/d2data/descent2.sow)'
-  read
-  if [ -z "$REPLY" ]; then return 2; fi
-  if [ -f "$REPLY" ]; then
-    cont=0;
-  else
-    echo -e "Bad path (Enter to abort)\n"
-  fi
-  done
+echo 'Put your Descent 2 data files either to /usr/share/d2x-rebirth/ or ~/.d2x-rebirth/'
 
-  descent_file="$REPLY"
-  
-  cd /usr/share/d2x-rebirth/
-  unarj e "$descent_file" &> /dev/null
-  if (($?)); then echo -e '!! Error with unarj !!\n' >&2; return 2; fi
-  rm *.exe *.dll *.txt *.bat descent.cfg descentg.ini \
-  descent.hi *.doc eregcard.ini &>/dev/null
-
-  read -p 'Would you like to include movies files (need 210 MB more space) (N/y) ? '
-  case $REPLY in
-    y|Y) :;;
-    *) return 0;;
-  esac
-
-  cont=1
-  while (($cont)); do
-  echo 'Give me the complete path to the directory that contains those movies (example, with the cd drive : /path/to/drive/d2data/)'
-  read
-  if [ -z "$REPLY" ]; then return 2; fi
-  if [ -d "$REPLY" ]; then
-    cont=0;
-  else
-    echo -e "Bad path (Enter to abort)\n"
-  fi
-  done
-
-  movies_path="$REPLY"
-  cp "$movies_path"/*-h.mvl . &> /dev/null
-
-  chmod 644 * &> /dev/null
-  return 0
-  }
-
-  old_path=`pwd`
-  install_datas
-  ret=$?
-  cd $old_path
-
-  if (($ret)); then
-    echo 'Put your Descent 2 datas either to /usr/share/d2x-rebirth/ or ~/.d2x-rebirth/'
-
-    cat << EOF
+cat << EOF
 Following files are needed to run the game:
 
 descent2.ham
@@ -100,7 +34,6 @@ You can get AddOns for the game from http://www.dxx-rebirth.com/addons/
 
 EOF
 
-  fi
 }
 
 post_upgrade() {