From 605df291ca7391a6ee1c05ac3dd8d98498fdcd98 Mon Sep 17 00:00:00 2001 From: Alexey Yakovenko Date: Sun, 2 Feb 2014 21:37:42 +0100 Subject: 0.6.1 --- tools/packages/arch.sh | 11 +++++++++-- tools/packages/debian.sh | 17 ++++++++--------- 2 files changed, 17 insertions(+), 11 deletions(-) (limited to 'tools/packages') 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 -- cgit v1.2.3