rdiff-backup and backupninja update

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

diff --git a/others/backupninja/backupninja-0.9.3.diff b/app/backup/backupninja/backupninja-0.9.3.diff
similarity index 100%
rename from others/backupninja/backupninja-0.9.3.diff
rename to app/backup/backupninja/backupninja-0.9.3.diff

diff --git a/others/backupninja/backupninja-0.9.4.diff b/app/backup/backupninja/backupninja-0.9.4.diff
similarity index 100%
rename from others/backupninja/backupninja-0.9.4.diff
rename to app/backup/backupninja/backupninja-0.9.4.diff

diff --git a/others/backupninja/backupninja.SlackBuild b/app/backup/backupninja/backupninja.SlackBuild
similarity index 79%
rename from others/backupninja/backupninja.SlackBuild
rename to app/backup/backupninja/backupninja.SlackBuild
index c890cc788c9cd2bc3bb8b798f89757eb310b16b7..31e37f63490aa37da3574be20f7437433cb7bbb9 100755 (executable)
--- a/others/backupninja/backupninja.SlackBuild
+++ b/app/backup/backupninja/backupninja.SlackBuild
@@ -21,6 +21,12 @@ SRC_DIR=${SRC:=$CWD}
 TMP=${TMP:=/tmp}
 REPOS=${REPOS:=$TMP}
 
+# -------  error codes for createpkg  --------------
+ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
+ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
+ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
+ERROR_PATCH=40
+
 if [ "$ARCH" == "x86_64" ]; then
   LIBDIR=/usr/lib64
 else
@@ -42,7 +48,7 @@ else
 fi
 
 if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then
-  wget "$URL" -O "$SRC_DIR/$SRC"
+  wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
 TMP="$TMP/$PACKAGE"
@@ -50,17 +56,17 @@ rm -rf $TMP
 mkdir -p $TMP
 cd $TMP
 
-tar xvf$tarflag $SRC_DIR/$SRC
+tar xvf$tarflag $SRC_DIR/$SRC || exit $ERROR_TAR
 cd $PACKAGE-$VERSION
 
 if [ -f "$CWD/$PACKAGE-$VERSION.diff" ]; then
-  patch -p1 < $CWD/$PACKAGE-$VERSION.diff
+  patch -p1 < $CWD/$PACKAGE-$VERSION.diff || exit $ERROR_WGET
 fi
 
-./autogen.sh
-./configure --prefix=/usr --sysconfdir=/etc --libdir=$LIBDIR
-make || exit 32
-make DESTDIR=$TMP/package-$PACKAGE install
+./autogen.sh || exit $ERROR_CONF
+./configure --prefix=/usr --sysconfdir=/etc --libdir=$LIBDIR || exit $ERROR_CONF
+make || exit $ERROR_MAKE
+make DESTDIR=$TMP/package-$PACKAGE install || exit $ERROR_INSTALL
 
 cp $CWD/rub $TMP/package-$PACKAGE/usr/share/$PACKAGE/
 rm -rf $TMP/package-$PACKAGE/etc/cron.d
@@ -108,7 +114,7 @@ done
 # install script
 echo '( if [ ! -f "etc/backupninja.conf" ]; then mv etc/backupninja.conf.new etc/backupninja.conf; fi )' > install/doinst.sh
 
-makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz
+makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG
 
 if [ "$CLEANUP" == "yes" ]; then
   rm -rf $TMP

diff --git a/others/backupninja/backupninja.cron b/app/backup/backupninja/backupninja.cron
similarity index 100%
rename from others/backupninja/backupninja.cron
rename to app/backup/backupninja/backupninja.cron

diff --git a/others/backupninja/rub b/app/backup/backupninja/rub
similarity index 100%
rename from others/backupninja/rub
rename to app/backup/backupninja/rub

diff --git a/app/backup/rdiff-backup/rdiff-backup.SlackBuild b/app/backup/rdiff-backup/rdiff-backup.SlackBuild
index a9c56774405c20c394eae04d8b5c2d04b24931ae..a0c1e8d857acaf9222fb4984968e35039f9f23e6 100755 (executable)
--- a/app/backup/rdiff-backup/rdiff-backup.SlackBuild
+++ b/app/backup/rdiff-backup/rdiff-backup.SlackBuild
@@ -13,7 +13,7 @@ fi
 
 # default settings
 PACKAGE="rdiff-backup"
-VERSION=${VERSION:=1.0.4}
+VERSION=${VERSION:=1.0.5}
 ARCH=${ARCH:=i386}
 BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC:=$CWD}

diff --git a/app/backup/rdiff-backup/rdiff-backup.build b/app/backup/rdiff-backup/rdiff-backup.build
index 9afd64e87725144bfe86521b49be4fc3821068b3..93276ec4c817e4e61527e467dbd8a1ab1435b94d 100755 (executable)
--- a/app/backup/rdiff-backup/rdiff-backup.build
+++ b/app/backup/rdiff-backup/rdiff-backup.build
@@ -4,7 +4,7 @@
 # by rhatto at riseup.net by rhatto | gpl
 # build it with slacktrack, example:
 #
-#   ARCH=x86_64 slacktrack -jefkzp "rdiff-backup-1.0.4-x86_64-1rha.tgz" "./rdiff-backup.build"
+#   ARCH=x86_64 slacktrack -jefkzp "rdiff-backup-1.0.5-x86_64-1rha.tgz" "./rdiff-backup.build"
 # 
 
 CWD="`pwd`"
@@ -32,11 +32,17 @@ fi
 # default settings
 PACKAGE="rdiff-backup"
 TMP=${TMP:=/tmp}
-VERSION=${VERSION:=1.0.4}
+VERSION=${VERSION:=1.0.5}
 ARCH=${ARCH:=i386}
 BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC:=$CWD}
 
+# -------  error codes for createpkg  --------------
+ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
+ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
+ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
+ERROR_PATCH=40
+
 if [ "$ARCH" == "x86_64" ]; then
   LIBDIR=/usr/lib64
 else
@@ -55,13 +61,7 @@ if [ ! -d "$SRC_DIR" ]; then
 fi
 
 if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then
- wget "$URL" -O "$SRC_DIR/$SRC"
-fi
-
-if [ "$PACKAGE_EXT" == "bz2" ]; then
-  tarflag="j"
-else
-  tarflag="z"
+ wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
 TMP="$TMP/$PACKAGE"
@@ -70,13 +70,13 @@ if [ ! -d "$TMP" ]; then
   mkdir -p $TMP
 fi
 
-tar xvf$tarflag $SRC_DIR/$SRC
+tar xvf $SRC_DIR/$SRC || exit $ERROR_TAR
 cd $PACKAGE-$VERSION
 
 # config and install!
 mkdir -p /install
 
-python setup.py install --prefix=/usr/
+python setup.py install --prefix=/usr/ || exit $ERROR_INSTALL
 
 # make the package