libgcrypt update

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@63 370017ae-e619-0410-ac65-c121f96126d4

1 files changed, 20 insertions, 40 deletions

diff --git a/libgcrypt/libgcrypt.SlackBuild b/libgcrypt/libgcrypt.SlackBuild
index fdc753bf..9706d0f1 100755
--- a/libgcrypt/libgcrypt.SlackBuild
+++ b/libgcrypt/libgcrypt.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # slackbuild for libgcrypt from http://www.slacky.it/download/libraries/libgcrypt/1.2.2/src
 #
@@ -12,13 +12,6 @@
 
 CWD=`pwd`
 
-# default settings
-PACKAGE="libgcrypt"
-_VERSION="1.2.2"
-_ARCH="x86_64"
-_BUILD="1rha"
-_TMP="/tmp"
-
 if [ -f "/etc/slackbuildrc" ]; then
   source /etc/slackbuildrc
 fi
@@ -27,17 +20,14 @@ if [ -f "~/.slackbuildrc" ]; then
   source ~/.slackbuildrc
 fi
 
-if [ -z "$VERSION" ]; then
-  VERSION="$_VERSION"
-fi
-
-if [ -z "$ARCH" ]; then
-  ARCH="$_ARCH"
-fi
-
-if [ -z "$BUILD" ]; then
-  BUILD="$_BUILD"
-fi
+# default settings
+PACKAGE="libgcrypt"
+ARCH=${ARCH:=x86_64}
+VERSION=${VERSION:=1.2.2}
+BUILD=${BUILD:=1rha}
+SRC_DIR=${SRC:=$CWD}
+TMP=${TMP:=/tmp}
+REPOS=${REPOS:=$TMP}
 
 if [ "$ARCH" == "x86_64" ]; then
   LIBDIR=/usr/lib64
@@ -45,22 +35,11 @@ else
   LIBDIR=/usr/lib
 fi
 
-if [ -z "$SRC" ]; then
-  SRC_DIR="$CWD"
-else
-  SRC_DIR="$SRC"
-fi
-
-if [ -z "$TMP" ]; then
-  TMP="$_TMP"
-fi
-
 RTOOL="wget"
 PACKAGE_EXT="bz2"
 NAME="$PACKAGE"
 SRC="$PACKAGE-$VERSION.tar.$PACKAGE_EXT"
 URL="ftp://ftp.gnupg.org/gcrypt/$PACKAGE/$SRC"
-PKG=$TMP/package-$PACKAGE
 
 if [ "$PACKAGE_EXT" == "bz2" ]; then
   tarflag="j"
@@ -68,6 +47,9 @@ else
   tarflag="z"
 fi
 
+SRC_DIR="$SRC_DIR/$PACKAGE"
+mkdir -p $SRC_DIR
+
 if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then
   wget "$URL" -O "$SRC_DIR/$SRC"
   wget "$URL.sig" -O "$SRC_DIR/$SRC.sig"
@@ -81,14 +63,13 @@ elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2"
 fi
 
-if [ ! -d $TMP ]; then
-  mkdir -p $TMP
-fi
-if [ ! -d $PKG ]; then
-  mkdir -p $PKG
-fi
+TMP="$TMP/$PACKAGE"
+PKG=$TMP/package-$PACKAGE
+rm -rf $TMP
+mkdir -p $PKG
 
 cd $TMP
+
 tar xvf$tarflag $SRC_DIR/$SRC
 cd $NAME-$VERSION
 chown -R root.root .
@@ -123,9 +104,8 @@ echo 'chroot . /sbin/ldconfig' > $PKG/install/doinst.sh
 cd $PKG
 #requiredbuilder -v -y $PKG
 
-makepkg -l y -c n $TMP/$NAME-$VERSION-$ARCH-$BUILD.tgz
+makepkg -l y -c n $REPOS/$NAME-$VERSION-$ARCH-$BUILD.tgz
 
-if [ "$1" = "--cleanup" ]; then
-  rm -rf $TMP/$NAME-$VERSION
-  rm -rf $PKG
+if [ "$CLEANUP" == "yes" ]; then
+  rm -rf $TMP
 fi