summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rwxr-xr-xtools/packages/arch.sh11
-rwxr-xr-xtools/packages/debian.sh17
2 files changed, 17 insertions, 11 deletions
diff --git a/tools/packages/arch.sh b/tools/packages/arch.sh
index 47f54a8e..8f2e5c3e 100755
--- a/tools/packages/arch.sh
+++ b/tools/packages/arch.sh
@@ -1,10 +1,17 @@
-#!/bin/sh
+#!/bin/bash
PWD=`pwd`
VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print'`
ARCH_VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print' | sed 's/-//'`
BUILD=`cat PORTABLE_BUILD | perl -ne 'chomp and print'`
-ARCH=`uname -m | perl -ne 'chomp and print'`
+if [[ "$ARCH" == "i686" ]]; then
+ echo
+elif [[ "$ARCH" == "x86_64" ]]; then
+ echo
+else
+ echo unknown arch $ARCH
+ exit -1
+fi
INDIR=$PWD/static/$ARCH/deadbeef-$VERSION
TEMPDIR=$PWD/package_temp/$ARCH/arch-$VERSION
PKGINFO=$TEMPDIR/.PKGINFO
diff --git a/tools/packages/debian.sh b/tools/packages/debian.sh
index 58d02602..d4c1e5d9 100755
--- a/tools/packages/debian.sh
+++ b/tools/packages/debian.sh
@@ -1,21 +1,20 @@
-#!/bin/sh
+#!/bin/bash
PWD=`pwd`
VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print'`
DEB_VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print' | sed 's/-/~/'`
BUILD=`cat PORTABLE_BUILD | perl -ne 'chomp and print'`
-ARCH=`uname -m | perl -ne 'chomp and print'`
-INDIR=$PWD/static/$ARCH/deadbeef-$VERSION
-TEMPDIR=$PWD/package_temp/$ARCH/debian-$VERSION
-OUTDIR=$PWD/package_out/$ARCH/debian
-
-if [ "$ARCH" = "i686" ] ; then
+if [[ "$ARCH" == "i686" ]]; then
DEB_ARCH=i386
-elif [ "$ARCH" = "x86_64" ] ; then
+elif [[ "$ARCH" == "x86_64" ]]; then
DEB_ARCH=amd64
else
- DEB_ARCH=unknown
+ echo unknown arch $ARCH
+ exit -1
fi
+INDIR=$PWD/static/$ARCH/deadbeef-$VERSION
+TEMPDIR=$PWD/package_temp/$ARCH/debian-$VERSION
+OUTDIR=$PWD/package_out/$ARCH/debian
# make dirs
rm -rf $TEMPDIR