aboutsummaryrefslogtreecommitdiff
path: root/media
diff options
context:
space:
mode:
authorrudson <rudson@370017ae-e619-0410-ac65-c121f96126d4>2006-12-02 23:09:35 +0000
committerrudson <rudson@370017ae-e619-0410-ac65-c121f96126d4>2006-12-02 23:09:35 +0000
commit7b435b9e24bdc4e027adb9fa66d2de0b58202e05 (patch)
treec90796a63e8d648a1725a3b95baaf4dc3fa5c689 /media
parent600d92de2f48e0755ccceb010f5233778c861063 (diff)
downloadslackbuilds-7b435b9e24bdc4e027adb9fa66d2de0b58202e05.tar.gz
slackbuilds-7b435b9e24bdc4e027adb9fa66d2de0b58202e05.tar.bz2
removendo echos dos slackbuilds e corrigindo chamadas de erros
git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@747 370017ae-e619-0410-ac65-c121f96126d4
Diffstat (limited to 'media')
-rwxr-xr-xmedia/gfx/digikam/digikam.SlackBuild50
-rwxr-xr-xmedia/gfx/exiv2/exiv2.SlackBuild50
-rwxr-xr-xmedia/libs/libdvdcss/libdvdcss.SlackBuild50
-rwxr-xr-xmedia/libs/libdvdplay/libdvdplay.SlackBuild49
-rwxr-xr-xmedia/libs/libdvdread/libdvdread.SlackBuild49
-rw-r--r--media/libs/libkexif/libkexif.SlackBuild51
-rwxr-xr-xmedia/libs/libkipi/libkipi.SlackBuild50
-rwxr-xr-xmedia/sound/lame/lame.SlackBuild50
-rwxr-xr-xmedia/video/dvdauthor/dvdauthor.SlackBuild50
-rwxr-xr-xmedia/video/vamps/vamps.SlackBuild52
10 files changed, 80 insertions, 421 deletions
diff --git a/media/gfx/digikam/digikam.SlackBuild b/media/gfx/digikam/digikam.SlackBuild
index 1e0c4fa0..00d74dbd 100755
--- a/media/gfx/digikam/digikam.SlackBuild
+++ b/media/gfx/digikam/digikam.SlackBuild
@@ -53,24 +53,13 @@ URL=${URL:="http://ufpr.dl.sourceforge.net/sourceforge/digikam/$SRC"}
SOURCE=$SRC_DIR/$PACKAGE/$SRC
# Verifica existência do pacote em $SRC em $SRC_DIR
if [ ! -e $SOURCE ]; then
- echo -e "\n\n\033[01;32m Download $PACKAGE \n\033[m"
- wget "$URL" -P "$SRC_DIR/$PACKAGE"
- # Verifica se o
- if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m No such source file in $URL\n\033[m"
- exit $ERROR_WGET
- fi
+ wget "$URL" -P "$SRC_DIR/$PACKAGE" || exit $ERROR_WGET
fi
# ------------------ Checa md5sum -----------------------
if [ "$SRC_ORIG" = "$SRC" -o "$MD5" != "$MD5_ORIG" -a "$MD5" != "no" ]; then
SUM=`md5sum $SOURCE | awk '{print $1}'`
- if [ "$SUM" != "$MD5" ]; then
- echo -e "\n\n\033[01;31m MD5SUM error: run Slackbuild again \n\033[m"
- echo -e "\033[01;31m Remove $PACKAGE from $SRC_DIR and start Slackbuild again or use MD5=\"no\" \n\033[m"
- exit 0
- fi
- echo -e "\n\n\033[01;32m Md5sum Ok \n\033[m"
+ [ "$SUM" != "$MD5" ] && exit $ERROR_MD5
fi
# ----------------- ARCH e LIBDIR -----------------------
@@ -96,11 +85,8 @@ PKG_SRC=$TMP/$PACKAGE-source
rm -rf $PKG_SRC 2>/dev/null
mkdir -p $PKG_SRC
# Desempacota $SOURCE em $TMP/$PACKAGE-source
-tar xvf $SOURCE -C $PKG_SRC
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m $SOURCE file error \n\033[m"
- exit $ERROR_TAR
-fi
+tar xvf $SOURCE -C $PKG_SRC || exit $ERROR_TAR
+
# Pega o nome do diretório das fontes independente de sua
# estrutura (package-version...)
PKG_DIR="$PKG_SRC/$( ls $PKG_SRC/ )"
@@ -108,20 +94,10 @@ cd $PKG_DIR
# -------------- Configura programa ---------------------
# Configura programa
-echo -e "\n\n\033[01;32m CFLAGS=\"$SLKCFLAGS\" ./configure --prefix=$PREFIX --libdir=$LIBDIR $OPTCONF \n\033[m"
-CFLAGS="$SLKCFLAGS" ./configure --prefix=$PREFIX --libdir=$LIBDIR $OPTCONF
-if [ $? -ne 0 -o "$OPTCONF" = "--help" ]; then
- echo -e "\n\n\033[01;31m Configure error \n\033[m"
- exit $ERROR_CONF
-fi
+CFLAGS="$SLKCFLAGS" ./configure --prefix=$PREFIX --libdir=$LIBDIR $OPTCONF || exit $ERROR_CONF
# ---------------- Compila programa ---------------------
-echo -e "\n\n\033[01;32m make -j3 \n\033[m"
-make -j3
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m Build error \n\033[m"
- exit $ERROR_MAKE
-fi
+make -j3 || exit $ERROR_MAKE
# ------------- Diretório Temporário --------------------
# Cria diretório temporário para construção do pacote
@@ -131,12 +107,7 @@ mkdir -p $PKG
# --------------- Instala programa ----------------------
# Instala programa em diretório temporário
-echo -e "\n\n\033[01;32m make install DESTDIR=$PKG \n\033[m"
-make install DESTDIR=$PKG
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m Install error \n\033[m"
- exit $ERROR_INSTALL
-fi
+make install DESTDIR=$PKG || exit $ERROR_INSTALL
# ----------------- Stripa código -----------------------
cd $PKG
@@ -173,14 +144,9 @@ mkdir -p $PKG_DOC
cp $PKG_DIR/{AUTHORS,COPYING,ChangeLog,HACKING,INSTALL,NEWS,README,RELEASE.rev,TODO} $PKG_DOC
# --------------- Constroi o pacote ---------------------
-echo -e "\n\n\033[01;32m makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz \n\033[m"
-makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz
-if [ $? -ne 0 ]; then
- exit $ERROR_MKPKG
-fi
+makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG
# ----------- Remove arquivos temporários ---------------
if [ "$CLEANUP" = "yes" ]; then
- echo -e "\n\n\033[01;32m Remove files... \n\033[m"
rm -rf $PKG $PKG_SRC
fi
diff --git a/media/gfx/exiv2/exiv2.SlackBuild b/media/gfx/exiv2/exiv2.SlackBuild
index 0f41c996..6f563b85 100755
--- a/media/gfx/exiv2/exiv2.SlackBuild
+++ b/media/gfx/exiv2/exiv2.SlackBuild
@@ -47,24 +47,13 @@ URL=${URL:="http://www.exiv2.org/$SRC"}
SOURCE=$SRC_DIR/$PACKAGE/$SRC
# Verifica existência do pacote em $SRC em $SRC_DIR
if [ ! -e $SOURCE ]; then
- echo -e "\n\n\033[01;32m Download $PACKAGE \n\033[m"
- wget "$URL" -P "$SRC_DIR/$PACKAGE"
- # Verifica se o
- if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m No such source file in $URL\n\033[m"
- exit $ERROR_WGET
- fi
+ wget "$URL" -P "$SRC_DIR/$PACKAGE" || exit $ERROR_WGET
fi
# ------------------ Checa md5sum -----------------------
if [ "$SRC_ORIG" = "$SRC" -o "$MD5" != "$MD5_ORIG" -a "$MD5" != "no" ]; then
SUM=`md5sum $SOURCE | awk '{print $1}'`
- if [ "$SUM" != "$MD5" ]; then
- echo -e "\n\n\033[01;31m MD5SUM error: run Slackbuild again \n\033[m"
- echo -e "\033[01;31m Remove $PACKAGE from $SRC_DIR and start Slackbuild again or use MD5=\"no\" \n\033[m"
- exit 0
- fi
- echo -e "\n\n\033[01;32m Md5sum Ok \n\033[m"
+ [ "$SUM" != "$MD5" ] && exit $ERROR_MD5
fi
# ----------------- ARCH e LIBDIR -----------------------
@@ -90,11 +79,8 @@ PKG_SRC=$TMP/$PACKAGE-source
rm -rf $PKG_SRC 2>/dev/null
mkdir -p $PKG_SRC
# Desempacota $SOURCE em $TMP/$PACKAGE-source
-tar xvf $SOURCE -C $PKG_SRC
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m $SOURCE file error \n\033[m"
- exit $ERROR_TAR
-fi
+tar xvf $SOURCE -C $PKG_SRC || exit $ERROR_TAR
+
# Pega o nome do diretório das fontes independente de sua
# estrutura (package-version...)
PKG_DIR="$PKG_SRC/$( ls $PKG_SRC/ )"
@@ -102,20 +88,10 @@ cd $PKG_DIR
# -------------- Configura programa ---------------------
# Configura programa
-echo -e "\n\n\033[01;32m CFLAGS=\"$SLKCFLAGS\" ./configure --prefix=$PREFIX --libdir=$LIBDIR $OPTCONF \n\033[m"
-CFLAGS="$SLKCFLAGS" ./configure --prefix=$PREFIX --libdir=$LIBDIR $OPTCONF
-if [ $? -ne 0 -o "$OPTCONF" = "--help" ]; then
- echo -e "\n\n\033[01;31m Configure error \n\033[m"
- exit $ERROR_CONF
-fi
+CFLAGS="$SLKCFLAGS" ./configure --prefix=$PREFIX --libdir=$LIBDIR $OPTCONF || exit $ERROR_CONF
# ---------------- Compila programa ---------------------
-echo -e "\n\n\033[01;32m make -j3 \n\033[m"
-make -j3
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m Build error \n\033[m"
- exit $ERROR_MAKE
-fi
+make -j3 || exit $ERROR_MAKE
# ------------- Diretório Temporário --------------------
# Cria diretório temporário para construção do pacote
@@ -125,12 +101,8 @@ mkdir -p $PKG
# --------------- Instala programa ----------------------
# Instala programa em diretório temporário
-echo -e "\n\n\033[01;32m make install DESTDIR=$PKG \n\033[m"
-make install DESTDIR=$PKG
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m Install error \n\033[m"
- exit $ERROR_INSTALL
-fi
+make install DESTDIR=$PKG || exit $ERROR_INSTALL
+
# --------------- Compacta manuais ----------------------
gzip -r $PKG/shared/man/*
@@ -171,13 +143,9 @@ cp -r $PKG_DIR/doc $PKG_DOC
# --------------- Constroi o pacote ---------------------
echo -e "\n\n\033[01;32m makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz \n\033[m"
-makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz
-if [ $? -ne 0 ]; then
- exit $ERROR_MKPKG
-fi
+makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG
# ----------- Remove arquivos temporários ---------------
if [ "$CLEANUP" = "yes" ]; then
- echo -e "\n\n\033[01;32m Remove files... \n\033[m"
rm -rf $PKG $PKG_SRC
fi
diff --git a/media/libs/libdvdcss/libdvdcss.SlackBuild b/media/libs/libdvdcss/libdvdcss.SlackBuild
index ec4a9721..bcfa9af4 100755
--- a/media/libs/libdvdcss/libdvdcss.SlackBuild
+++ b/media/libs/libdvdcss/libdvdcss.SlackBuild
@@ -47,24 +47,13 @@ URL=${URL:="http://download.videolan.org/pub/libdvdcss/$VERSION/$SRC"}
SOURCE=$SRC_DIR/$PACKAGE/$SRC
# Verifica existência do pacote em $SRC em $SRC_DIR
if [ ! -e $SOURCE ]; then
- echo -e "\n\n\033[01;32m Download $PACKAGE \n\033[m"
- wget "$URL" -P "$SRC_DIR/$PACKAGE"
- # Verifica se o
- if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m No such source file in $URL\n\033[m"
- exit $ERROR_WGET
- fi
+ wget "$URL" -P "$SRC_DIR/$PACKAGE" || exit $ERROR_WGET
fi
# ------------------ Checa md5sum -----------------------
if [ "$SRC_ORIG" = "$SRC" -o "$MD5" != "$MD5_ORIG" -a "$MD5" != "no" ]; then
SUM=`md5sum $SOURCE | awk '{print $1}'`
- if [ "$SUM" != "$MD5" ]; then
- echo -e "\n\n\033[01;31m MD5SUM error: run Slackbuild again \n\033[m"
- echo -e "\033[01;31m Remove $PACKAGE from $SRC_DIR and start Slackbuild again or use MD5=\"no\" \n\033[m"
- exit 0
- fi
- echo -e "\n\n\033[01;32m Md5sum Ok \n\033[m"
+ [ "$SUM" != "$MD5" ] && exit $ERROR_MD5
fi
# ----------------- ARCH e LIBDIR -----------------------
@@ -90,11 +79,8 @@ PKG_SRC=$TMP/$PACKAGE-source
rm -rf $PKG_SRC 2>/dev/null
mkdir -p $PKG_SRC
# Desempacota $SOURCE em $TMP/$PACKAGE-source
-tar xvf $SOURCE -C $PKG_SRC
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m $SOURCE file error \n\033[m"
- exit $ERROR_TAR
-fi
+tar xvf $SOURCE -C $PKG_SRC || exit $ERROR_TAR
+
# Pega o nome do diretório das fontes independente de sua
# estrutura (package-version...)
PKG_DIR="$PKG_SRC/$( ls $PKG_SRC/ )"
@@ -102,20 +88,10 @@ cd $PKG_DIR
# -------------- Configura programa ---------------------
# Configura programa
-echo -e "\n\n\033[01;32m CFLAGS=\"$SLKCFLAGS\" ./configure --prefix=$PREFIX --libdir=$LIBDIR $OPTCONF \n\033[m"
-CFLAGS="$SLKCFLAGS" ./configure --prefix=$PREFIX --libdir=$LIBDIR $OPTCONF
-if [ $? -ne 0 -o "$OPTCONF" = "--help" ]; then
- echo -e "\n\n\033[01;31m Configure error \n\033[m"
- exit $ERROR_CONF
-fi
+CFLAGS="$SLKCFLAGS" ./configure --prefix=$PREFIX --libdir=$LIBDIR $OPTCONF || exit $ERROR_CONF
# ---------------- Compila programa ---------------------
-echo -e "\n\n\033[01;32m make -j3 \n\033[m"
-make -j3
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m Build error \n\033[m"
- exit $ERROR_MAKE
-fi
+make -j3 || exit $ERROR_MAKE
# ------------- Diretório Temporário --------------------
# Cria diretório temporário para construção do pacote
@@ -125,12 +101,7 @@ mkdir -p $PKG
# --------------- Instala programa ----------------------
# Instala programa em diretório temporário
-echo -e "\n\n\033[01;32m make install DESTDIR=$PKG \n\033[m"
-make install DESTDIR=$PKG
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m Install error \n\033[m"
- exit $ERROR_INSTALL
-fi
+make install DESTDIR=$PKG || exit $ERROR_INSTALL
# ----------------- Stripa código -----------------------
cd $PKG
@@ -169,14 +140,9 @@ mkdir $PKG_DOC/html
cp $PKG_DIR/doc/html/* $PKG_DOC/html/
# --------------- Constroi o pacote ---------------------
-echo -e "\n\n\033[01;32m makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz \n\033[m"
-makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz
-if [ $? -ne 0 ]; then
- exit $ERROR_MKPKG
-fi
+makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG
# ----------- Remove arquivos temporários ---------------
if [ "$CLEANUP" = "yes" ]; then
- echo -e "\n\n\033[01;32m Remove files... \n\033[m"
rm -rf $PKG $PKG_SRC
fi
diff --git a/media/libs/libdvdplay/libdvdplay.SlackBuild b/media/libs/libdvdplay/libdvdplay.SlackBuild
index 4a90f98a..f0e2143e 100755
--- a/media/libs/libdvdplay/libdvdplay.SlackBuild
+++ b/media/libs/libdvdplay/libdvdplay.SlackBuild
@@ -47,24 +47,13 @@ URL=${URL:="http://download.videolan.org/pub/libdvdplay/$VERSION/$SRC"}
SOURCE=$SRC_DIR/$PACKAGE/$SRC
# Verifica existência do pacote em $SRC em $SRC_DIR
if [ ! -e $SOURCE ]; then
- echo -e "\n\n\033[01;32m Download $PACKAGE \n\033[m"
- wget "$URL" -P "$SRC_DIR/$PACKAGE"
- # Verifica se o
- if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m No such source file in $URL\n\033[m"
- exit $ERROR_WGET
- fi
+ wget "$URL" -P "$SRC_DIR/$PACKAGE" || exit $ERROR_WGET
fi
# ------------------ Checa md5sum -----------------------
if [ "$SRC_ORIG" = "$SRC" -o "$MD5" != "$MD5_ORIG" -a "$MD5" != "no" ]; then
SUM=`md5sum $SOURCE | awk '{print $1}'`
- if [ "$SUM" != "$MD5" ]; then
- echo -e "\n\n\033[01;31m MD5SUM error: run Slackbuild again \n\033[m"
- echo -e "\033[01;31m Remove $PACKAGE from $SRC_DIR and start Slackbuild again or use MD5=\"no\" \n\033[m"
- exit 0
- fi
- echo -e "\n\n\033[01;32m Md5sum Ok \n\033[m"
+ [ "$SUM" != "$MD5" ] && exit $ERROR_MD5
fi
# ----------------- ARCH e LIBDIR -----------------------
@@ -90,11 +79,8 @@ PKG_SRC=$TMP/$PACKAGE-source
rm -rf $PKG_SRC 2>/dev/null
mkdir -p $PKG_SRC
# Desempacota $SOURCE em $TMP/$PACKAGE-source
-tar xvf $SOURCE -C $PKG_SRC
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m $SOURCE file error \n\033[m"
- exit $ERROR_TAR
-fi
+tar xvf $SOURCE -C $PKG_SRC || exit $ERROR_TAR
+
# Pega o nome do diretório das fontes independente de sua
# estrutura (package-version...)
PKG_DIR="$PKG_SRC/$( ls $PKG_SRC/ )"
@@ -102,20 +88,10 @@ cd $PKG_DIR
# -------------- Configura programa ---------------------
# Configura programa
-echo -e "\n\n\033[01;32m CFLAGS=\"$SLKCFLAGS\" ./configure --prefix=$PREFIX --libdir=$LIBDIR $OPTCONF \n\033[m"
-CFLAGS="$SLKCFLAGS" ./configure --prefix=$PREFIX --libdir=$LIBDIR $OPTCONF
-if [ $? -ne 0 -o "$OPTCONF" = "--help" ]; then
- echo -e "\n\n\033[01;31m Configure error \n\033[m"
- exit $ERROR_CONF
-fi
+CFLAGS="$SLKCFLAGS" ./configure --prefix=$PREFIX --libdir=$LIBDIR $OPTCONF || exit $ERROR_CONF
# ---------------- Compila programa ---------------------
-echo -e "\n\n\033[01;32m make -j3 \n\033[m"
-make -j3
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m Build error \n\033[m"
- exit $ERROR_MAKE
-fi
+make -j3 || exit $ERROR_MAKE
# ------------- Diretório Temporário --------------------
# Cria diretório temporário para construção do pacote
@@ -125,12 +101,7 @@ mkdir -p $PKG
# --------------- Instala programa ----------------------
# Instala programa em diretório temporário
-echo -e "\n\n\033[01;32m make install DESTDIR=$PKG \n\033[m"
-make install DESTDIR=$PKG
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m Install error \n\033[m"
- exit $ERROR_INSTALL
-fi
+make install DESTDIR=$PKG || exit $ERROR_INSTALL
# ----------------- Stripa código -----------------------
cd $PKG
@@ -167,11 +138,7 @@ mkdir -p $PKG_DOC
cp $PKG_DIR/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README,THANKS,TODO} $PKG_DOC
# --------------- Constroi o pacote ---------------------
-echo -e "\n\n\033[01;32m makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz \n\033[m"
-makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz
-if [ $? -ne 0 ]; then
- exit $ERROR_MKPKG
-fi
+makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG
# ----------- Remove arquivos temporários ---------------
if [ "$CLEANUP" = "yes" ]; then
diff --git a/media/libs/libdvdread/libdvdread.SlackBuild b/media/libs/libdvdread/libdvdread.SlackBuild
index 45ae433f..741f85b2 100755
--- a/media/libs/libdvdread/libdvdread.SlackBuild
+++ b/media/libs/libdvdread/libdvdread.SlackBuild
@@ -47,24 +47,13 @@ URL=${URL:="http://freshmeat.net/redir/libdvdread/17926/url_tgz/$SRC"}
SOURCE=$SRC_DIR/$PACKAGE/$SRC
# Verifica existência do pacote em $SRC em $SRC_DIR
if [ ! -e $SOURCE ]; then
- echo -e "\n\n\033[01;32m Download $PACKAGE \n\033[m"
- wget "$URL" -P "$SRC_DIR/$PACKAGE"
- # Verifica se o
- if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m No such source file in $URL\n\033[m"
- exit $ERROR_WGET
- fi
+ wget "$URL" -P "$SRC_DIR/$PACKAGE" || exit $ERROR_WGET
fi
# ------------------ Checa md5sum -----------------------
if [ "$SRC_ORIG" = "$SRC" -o "$MD5" != "$MD5_ORIG" -a "$MD5" != "no" ]; then
SUM=`md5sum $SOURCE | awk '{print $1}'`
- if [ "$SUM" != "$MD5" ]; then
- echo -e "\n\n\033[01;31m MD5SUM error: run Slackbuild again \n\033[m"
- echo -e "\033[01;31m Remove $PACKAGE from $SRC_DIR and start Slackbuild again or use MD5=\"no\" \n\033[m"
- exit 0
- fi
- echo -e "\n\n\033[01;32m Md5sum Ok \n\033[m"
+ [ "$SUM" != "$MD5" ] && exit $ERROR_MD5
fi
# ----------------- ARCH e LIBDIR -----------------------
@@ -90,11 +79,8 @@ PKG_SRC=$TMP/$PACKAGE-source
rm -rf $PKG_SRC 2>/dev/null
mkdir -p $PKG_SRC
# Desempacota $SOURCE em $TMP/$PACKAGE-source
-tar xvf $SOURCE -C $PKG_SRC
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m $SOURCE file error \n\033[m"
- exit $ERROR_TAR
-fi
+tar xvf $SOURCE -C $PKG_SRC || exit $ERROR_TAR
+
# Pega o nome do diretório das fontes independente de sua
# estrutura (package-version...)
PKG_DIR="$PKG_SRC/$( ls $PKG_SRC/ )"
@@ -102,20 +88,10 @@ cd $PKG_DIR
# -------------- Configura programa ---------------------
# Configura programa
-echo -e "\n\n\033[01;32m CFLAGS=\"$SLKCFLAGS\" ./configure --prefix=$PREFIX --libdir=$LIBDIR $OPTCONF \n\033[m"
-CFLAGS="$SLKCFLAGS" ./configure --prefix=$PREFIX --libdir=$LIBDIR $OPTCONF --with-libdvdcss
-if [ $? -ne 0 -o "$OPTCONF" = "--help" ]; then
- echo -e "\n\n\033[01;31m Configure error \n\033[m"
- exit $ERROR_CONF
-fi
+CFLAGS="$SLKCFLAGS" ./configure --prefix=$PREFIX --libdir=$LIBDIR $OPTCONF --with-libdvdcss || exit $ERROR_CONF
# ---------------- Compila programa ---------------------
-echo -e "\n\n\033[01;32m make -j3 \n\033[m"
-make -j3
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m Build error \n\033[m"
- exit $ERROR_MAKE
-fi
+make -j3 || exit $ERROR_MAKE
# ------------- Diretório Temporário --------------------
# Cria diretório temporário para construção do pacote
@@ -125,12 +101,7 @@ mkdir -p $PKG
# --------------- Instala programa ----------------------
# Instala programa em diretório temporário
-echo -e "\n\n\033[01;32m make install DESTDIR=$PKG \n\033[m"
-make install DESTDIR=$PKG
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m Install error \n\033[m"
- exit $ERROR_INSTALL
-fi
+make install DESTDIR=$PKG || exit $ERROR_INSTALL
# ----------------- Stripa código -----------------------
cd $PKG
@@ -167,11 +138,7 @@ mkdir -p $PKG_DOC
cp $PKG_DIR/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README,TODO} $PKG_DOC
# --------------- Constroi o pacote ---------------------
-echo -e "\n\n\033[01;32m makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz \n\033[m"
-makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz
-if [ $? -ne 0 ]; then
- exit $ERROR_MKPKG
-fi
+makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG
# ----------- Remove arquivos temporários ---------------
if [ "$CLEANUP" = "yes" ]; then
diff --git a/media/libs/libkexif/libkexif.SlackBuild b/media/libs/libkexif/libkexif.SlackBuild
index b81c91c7..6a16bf79 100644
--- a/media/libs/libkexif/libkexif.SlackBuild
+++ b/media/libs/libkexif/libkexif.SlackBuild
@@ -47,24 +47,13 @@ URL=${URL:="http://ufpr.dl.sourceforge.net/sourceforge/kipi/$SRC"}
SOURCE=$SRC_DIR/$PACKAGE/$SRC
# Verifica existência do pacote em $SRC em $SRC_DIR
if [ ! -e $SOURCE ]; then
- echo -e "\n\n\033[01;32m Download $PACKAGE \n\033[m"
- wget "$URL" -P "$SRC_DIR/$PACKAGE"
- # Verifica se o
- if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m No such source file in $URL\n\033[m"
- exit $ERROR_WGET
- fi
+ wget "$URL" -P "$SRC_DIR/$PACKAGE" || exit $ERROR_WGET
fi
# ------------------ Checa md5sum -----------------------
if [ "$SRC_ORIG" = "$SRC" -o "$MD5" != "$MD5_ORIG" -a "$MD5" != "no" ]; then
SUM=`md5sum $SOURCE | awk '{print $1}'`
- if [ "$SUM" != "$MD5" ]; then
- echo -e "\n\n\033[01;31m MD5SUM error: run Slackbuild again \n\033[m"
- echo -e "\033[01;31m Remove $PACKAGE from $SRC_DIR and start Slackbuild again or use MD5=\"no\" \n\033[m"
- exit 0
- fi
- echo -e "\n\n\033[01;32m Md5sum Ok \n\033[m"
+ [ "$SUM" != "$MD5" ] && exit $ERROR_MD5
fi
# ----------------- ARCH e LIBDIR -----------------------
@@ -90,11 +79,8 @@ PKG_SRC=$TMP/$PACKAGE-source
rm -rf $PKG_SRC 2>/dev/null
mkdir -p $PKG_SRC
# Desempacota $SOURCE em $TMP/$PACKAGE-source
-tar xvf $SOURCE -C $PKG_SRC
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m $SOURCE file error \n\033[m"
- exit $ERROR_TAR
-fi
+tar xvf $SOURCE -C $PKG_SRC || exit $ERROR_TAR
+
# Pega o nome do diretório das fontes independente de sua
# estrutura (package-version...)
PKG_DIR="$PKG_SRC/$( ls $PKG_SRC/ )"
@@ -102,21 +88,10 @@ cd $PKG_DIR
# -------------- Configura programa ---------------------
# Configura programa
-echo -e "\n\n\033[01;32m CFLAGS=\"$SLKCFLAGS\" ./configure --prefix=$PREFIX --libdir=$LIBDIR $OPTCONF \n\033[m"
-
-CFLAGS="$SLKCFLAGS" ./configure --prefix=$PREFIX $OPTCONF --libdir=$LIBDIR
-if [ $? -ne 0 -o "$OPTCONF" = "--help" ]; then
- echo -e "\n\n\033[01;31m Configure error \n\033[m"
- exit $ERROR_CONF
-fi
+CFLAGS="$SLKCFLAGS" ./configure --prefix=$PREFIX $OPTCONF --libdir=$LIBDIR || exit $ERROR_CONF
# ---------------- Compila programa ---------------------
-echo -e "\n\n\033[01;32m make -j3 \n\033[m"
-make -j3
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m Build error \n\033[m"
- exit $ERROR_MAKE
-fi
+make -j3 || exit $ERROR_MAKE
# ------------- Diretório Temporário --------------------
# Cria diretório temporário para construção do pacote
@@ -126,12 +101,7 @@ mkdir -p $PKG
# --------------- Instala programa ----------------------
# Instala programa em diretório temporário
-echo -e "\n\n\033[01;32m make install DESTDIR=$PKG \n\033[m"
-make install DESTDIR=$PKG
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m Install error \n\033[m"
- exit $ERROR_INSTALL
-fi
+make install DESTDIR=$PKG || exit $ERROR_INSTALL
# ----------------- Stripa código -----------------------
cd $PKG
@@ -168,14 +138,9 @@ mkdir -p $PKG_DOC
cp $PKG_DIR/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,PACKAGING,README,RELEASE.rev} $PKG_DOC
# --------------- Constroi o pacote ---------------------
-echo -e "\n\n\033[01;32m makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz \n\033[m"
-makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz
-if [ $? -ne 0 ]; then
- exit $ERROR_MKPKG
-fi
+makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG
# ----------- Remove arquivos temporários ---------------
if [ "$CLEANUP" = "yes" ]; then
- echo -e "\n\n\033[01;32m Remove files... \n\033[m"
rm -rf $PKG $PKG_SRC
fi
diff --git a/media/libs/libkipi/libkipi.SlackBuild b/media/libs/libkipi/libkipi.SlackBuild
index 46c57efc..855a7cf6 100755
--- a/media/libs/libkipi/libkipi.SlackBuild
+++ b/media/libs/libkipi/libkipi.SlackBuild
@@ -47,24 +47,13 @@ URL=${URL:="http://superb-west.dl.sourceforge.net/sourceforge/kipi/$SRC"}
SOURCE=$SRC_DIR/$PACKAGE/$SRC
# Verifica existência do pacote em $SRC em $SRC_DIR
if [ ! -e $SOURCE ]; then
- echo -e "\n\n\033[01;32m Download $PACKAGE \n\033[m"
- wget "$URL" -P "$SRC_DIR/$PACKAGE"
- # Verifica se o
- if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m No such source file in $URL\n\033[m"
- exit $ERROR_WGET
- fi
+ wget "$URL" -P "$SRC_DIR/$PACKAGE" || exit $ERROR_WGET
fi
# ------------------ Checa md5sum -----------------------
if [ "$SRC_ORIG" = "$SRC" -o "$MD5" != "$MD5_ORIG" -a "$MD5" != "no" ]; then
SUM=`md5sum $SOURCE | awk '{print $1}'`
- if [ "$SUM" != "$MD5" ]; then
- echo -e "\n\n\033[01;31m MD5SUM error: run Slackbuild again \n\033[m"
- echo -e "\033[01;31m Remove $PACKAGE from $SRC_DIR and start Slackbuild again or use MD5=\"no\" \n\033[m"
- exit 0
- fi
- echo -e "\n\n\033[01;32m Md5sum Ok \n\033[m"
+ [ "$SUM" != "$MD5" ] && exit $ERROR_MD5
fi
# ----------------- ARCH e LIBDIR -----------------------
@@ -90,11 +79,8 @@ PKG_SRC=$TMP/$PACKAGE-source
rm -rf $PKG_SRC 2>/dev/null
mkdir -p $PKG_SRC
# Desempacota $SOURCE em $TMP/$PACKAGE-source
-tar xvf $SOURCE -C $PKG_SRC
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m $SOURCE file error \n\033[m"
- exit $ERROR_TAR
-fi
+tar xvf $SOURCE -C $PKG_SRC || exit $ERROR_TAR
+
# Pega o nome do diretório das fontes independente de sua
# estrutura (package-version...)
PKG_DIR="$PKG_SRC/$( ls $PKG_SRC/ )"
@@ -102,20 +88,10 @@ cd $PKG_DIR
# -------------- Configura programa ---------------------
# Configura programa
-echo -e "\n\n\033[01;32m CFLAGS=\"$SLKCFLAGS\" ./configure --prefix=$PREFIX --libdir=$LIBDIR $OPTCONF \n\033[m"
-CFLAGS="$SLKCFLAGS" ./configure --prefix=$PREFIX --libdir=$LIBDIR $OPTCONF
-if [ $? -ne 0 -o "$OPTCONF" = "--help" ]; then
- echo -e "\n\n\033[01;31m Configure error \n\033[m"
- exit $ERROR_CONF
-fi
+CFLAGS="$SLKCFLAGS" ./configure --prefix=$PREFIX --libdir=$LIBDIR $OPTCONF || exit $ERROR_CONF
# ---------------- Compila programa ---------------------
-echo -e "\n\n\033[01;32m make -j3 \n\033[m"
-make -j3
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m Build error \n\033[m"
- exit $ERROR_MAKE
-fi
+make -j3 || exit $ERROR_MAKE
# ------------- Diretório Temporário --------------------
# Cria diretório temporário para construção do pacote
@@ -125,12 +101,7 @@ mkdir -p $PKG
# --------------- Instala programa ----------------------
# Instala programa em diretório temporário
-echo -e "\n\n\033[01;32m make install DESTDIR=$PKG \n\033[m"
-make install DESTDIR=$PKG
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m Install error \n\033[m"
- exit $ERROR_INSTALL
-fi
+make install DESTDIR=$PKG || exit $ERROR_INSTALL
# ----------------- Stripa código -----------------------
cd $PKG
@@ -167,14 +138,9 @@ mkdir -p $PKG_DOC
cp $PKG_DIR/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README,README.rev,TODO} $PKG_DOC
# --------------- Constroi o pacote ---------------------
-echo -e "\n\n\033[01;32m makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz \n\033[m"
-makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz
-if [ $? -ne 0 ]; then
- exit $ERROR_MKPKG
-fi
+makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG
# ----------- Remove arquivos temporários ---------------
if [ "$CLEANUP" = "yes" ]; then
- echo -e "\n\n\033[01;32m Remove files... \n\033[m"
rm -rf $PKG $PKG_SRC
fi
diff --git a/media/sound/lame/lame.SlackBuild b/media/sound/lame/lame.SlackBuild
index 2a062b77..d8e24b6d 100755
--- a/media/sound/lame/lame.SlackBuild
+++ b/media/sound/lame/lame.SlackBuild
@@ -54,24 +54,13 @@ URL=${URL:="http://ufpr.dl.sourceforge.net/sourceforge/lame/$SRC"}
SOURCE=$SRC_DIR/$PACKAGE/$SRC
# Verifica existência do pacote $SRC em $SRC_DIR
if [ ! -e $SOURCE ]; then
- echo -e "\n\n\033[01;32m Download $PACKAGE \n\033[m"
- wget "$URL" -P "$SRC_DIR/$PACKAGE/"
- # Verifica se o
- if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m No such source file in $URL\n\033[m"
- exit $ERROR_WGET
- fi
+ wget "$URL" -P "$SRC_DIR/$PACKAGE/" || exit $ERROR_WGET
fi
# ------------------ Checa md5sum -----------------------
if [ "$SRC_ORIG" = "$SRC" -o "$MD5" != "$MD5_ORIG" -a "$MD5" != "no" ]; then
SUM=`md5sum $SOURCE | awk '{print $1}'`
- if [ "$SUM" != "$MD5" ]; then
- echo -e "\n\n\033[01;31m MD5SUM error: run Slackbuild again \n\033[m"
- echo -e "\033[01;31m Remove $PACKAGE from $SRC_DIR and start Slackbuild again or use MD5=\"no\" \n\033[m"
- exit $ERROR_MD5
- fi
- echo -e "\n\n\033[01;32m Md5sum Ok \n\033[m"
+ [ "$SUM" != "$MD5" ] && exit $ERROR_MD5
fi
# ----------------- ARCH e LIBDIR -----------------------
@@ -97,11 +86,8 @@ PKG_SRC=$TMP/$PACKAGE-source
rm -rf $PKG_SRC 2>/dev/null
mkdir -p $PKG_SRC
# Desempacota $SOURCE em $TMP/$PACKAGE-source
-tar xvf $SOURCE -C $PKG_SRC
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m $SOURCE file error \n\033[m"
- exit $ERROR_TAR
-fi
+tar xvf $SOURCE -C $PKG_SRC || exit $ERROR_TAR
+
# Pega o nome do diretório das fontes independente de sua
# estrutura (package-version...)
PKG_DIR="$PKG_SRC/$( ls $PKG_SRC/ )"
@@ -109,20 +95,10 @@ cd $PKG_DIR
# -------------- Configura programa ---------------------
# Configura programa
-echo -e "\n\n\033[01;32m CFLAGS=\"$SLKCFLAGS\" ./configure --prefix=$PREFIX --libdir=$LIBDIR $OPTCONF \n\033[m"
-CFLAGS="$SLKCFLAGS" ./configure --prefix=$PREFIX --libdir=$LIBDIR $OPTCONF
-if [ $? -ne 0 -o "$OPTCONF" = "--help" ]; then
- echo -e "\n\n\033[01;31m Configure error \n\033[m"
- exit $ERROR_CONF
-fi
+CFLAGS="$SLKCFLAGS" ./configure --prefix=$PREFIX --libdir=$LIBDIR $OPTCONF || exit $ERROR_CONF
# ---------------- Compila programa ---------------------
-echo -e "\n\n\033[01;32m make all \n\033[m"
-make
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m Build error \n\033[m"
- exit $ERROR_MAKE
-fi
+make || exit $ERROR_MAKE
# ------------- Diretório Temporário --------------------
# Cria diretório temporário para construção do pacote
@@ -132,12 +108,7 @@ mkdir -p $PKG
# --------------- Instala programa ----------------------
# Instala programa em diretório temporário
-echo -e "\n\n\033[01;32m make install DESTDIR=$PKG \n\033[m"
-make install DESTDIR=$PKG
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m Install error \n\033[m"
- exit $ERROR_INSTALL
-fi
+make install DESTDIR=$PKG || exit $ERROR_INSTALL
# ------------------- gzip manuais ------------------------
gzip -r $PKG/$PREFIX/man/*
@@ -178,14 +149,9 @@ mkdir -p $PKG_DOC
cp $PKG_DIR/{API,COPYING,ChangeLog,DEFINES,HACKING,INSTALL,LICENSE,README,README.WINGTK,STYLEGUIDE,TODO,USAGE} $PKG_DOC
# --------------- Constroi o pacote ---------------------
-echo -e "\n\n\033[01;32m makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz \n\033[m"
-makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz
-if [ $? -ne 0 ]; then
- exit $ERROR_MKPKG
-fi
+makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG
# ----------- Remove arquivos temporários ---------------
if [ "$CLEANUP" = "yes" ]; then
- echo -e "\n\n\033[01;32m Remove files... \n\033[m"
rm -rf $PKG $PKG_SRC
fi
diff --git a/media/video/dvdauthor/dvdauthor.SlackBuild b/media/video/dvdauthor/dvdauthor.SlackBuild
index 7e002d6a..4105308d 100755
--- a/media/video/dvdauthor/dvdauthor.SlackBuild
+++ b/media/video/dvdauthor/dvdauthor.SlackBuild
@@ -47,24 +47,13 @@ URL=${URL:="http://superb-west.dl.sourceforge.net/sourceforge/dvdauthor/$SRC"}
SOURCE=$SRC_DIR/$PACKAGE/$SRC
# Verifica existência do pacote em $SRC em $SRC_DIR
if [ ! -e $SOURCE ]; then
- echo -e "\n\n\033[01;32m Download $PACKAGE \n\033[m"
- wget "$URL" -P "$SRC_DIR/$PACKAGE"
- # Verifica se o
- if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m No such source file in $URL\n\033[m"
- exit $ERROR_WGET
- fi
+ wget "$URL" -P "$SRC_DIR/$PACKAGE" || exit $ERROR_WGET
fi
# ------------------ Checa md5sum -----------------------
if [ "$SRC_ORIG" = "$SRC" -o "$MD5" != "$MD5_ORIG" -a "$MD5" != "no" ]; then
SUM=`md5sum $SOURCE | awk '{print $1}'`
- if [ "$SUM" != "$MD5" ]; then
- echo -e "\n\n\033[01;31m MD5SUM error: run Slackbuild again \n\033[m"
- echo -e "\033[01;31m Remove $PACKAGE from $SRC_DIR and start Slackbuild again or use MD5=\"no\" \n\033[m"
- exit 0
- fi
- echo -e "\n\n\033[01;32m Md5sum Ok \n\033[m"
+ [ "$SUM" != "$MD5" ] && exit $ERROR_MD5
fi
# ----------------- ARCH e LIBDIR -----------------------
@@ -90,11 +79,8 @@ PKG_SRC=$TMP/$PACKAGE-source
rm -rf $PKG_SRC 2>/dev/null
mkdir -p $PKG_SRC
# Desempacota $SOURCE em $TMP/$PACKAGE-source
-tar xvf $SOURCE -C $PKG_SRC
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m $SOURCE file error \n\033[m"
- exit $ERROR_TAR
-fi
+tar xvf $SOURCE -C $PKG_SRC || exit $ERROR_TAR
+
# Pega o nome do diretório das fontes independente de sua
# estrutura (package-version...)
PKG_DIR="$PKG_SRC/$( ls $PKG_SRC/ )"
@@ -102,20 +88,10 @@ cd $PKG_DIR
# -------------- Configura programa ---------------------
# Configura programa
-echo -e "\n\n\033[01;32m CFLAGS=\"$SLKCFLAGS\" ./configure --prefix=$PREFIX --libdir=$LIBDIR $OPTCONF \n\033[m"
-CFLAGS="$SLKCFLAGS" ./configure --prefix=$PREFIX --libdir=$LIBDIR $OPTCONF
-if [ $? -ne 0 -o "$OPTCONF" = "--help" ]; then
- echo -e "\n\n\033[01;31m Configure error \n\033[m"
- exit $ERROR_CONF
-fi
+CFLAGS="$SLKCFLAGS" ./configure --prefix=$PREFIX --libdir=$LIBDIR $OPTCONF || exit $ERROR_CONF
# ---------------- Compila programa ---------------------
-echo -e "\n\n\033[01;32m make -j3 \n\033[m"
-make -j3
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m Build error \n\033[m"
- exit $ERROR_MAKE
-fi
+make -j3 || exit $ERROR_MAKE
# ------------- Diretório Temporário --------------------
# Cria diretório temporário para construção do pacote
@@ -125,12 +101,7 @@ mkdir -p $PKG
# --------------- Instala programa ----------------------
# Instala programa em diretório temporário
-echo -e "\n\n\033[01;32m make install DESTDIR=$PKG \n\033[m"
-make install DESTDIR=$PKG
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m Install error \n\033[m"
- exit $ERROR_INSTALL
-fi
+make install DESTDIR=$PKG || exit $ERROR_INSTALL
# ------------------- gzip manuais ------------------------
gzip -r $PKG/$PREFIX/man/*
@@ -170,14 +141,9 @@ mkdir -p $PKG_DOC
cp $PKG_DIR/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README,TODO} $PKG_DOC
# --------------- Constroi o pacote ---------------------
-echo -e "\n\n\033[01;32m makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz \n\033[m"
-makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz
-if [ $? -ne 0 ]; then
- exit $ERROR_MKPKG
-fi
+makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG
# ----------- Remove arquivos temporários ---------------
if [ "$CLEANUP" = "yes" ]; then
- echo -e "\n\n\033[01;32m Remove files... \n\033[m"
rm -rf $PKG $PKG_SRC
fi
diff --git a/media/video/vamps/vamps.SlackBuild b/media/video/vamps/vamps.SlackBuild
index 753ca226..77b139df 100755
--- a/media/video/vamps/vamps.SlackBuild
+++ b/media/video/vamps/vamps.SlackBuild
@@ -47,24 +47,13 @@ URL=${URL:="http://ufpr.dl.sourceforge.net/sourceforge/vamps/$SRC"}
SOURCE=$SRC_DIR/$PACKAGE/$SRC
# Verifica existência do pacote em $SRC em $SRC_DIR
if [ ! -e $SOURCE ]; then
- echo -e "\n\n\033[01;32m Download $PACKAGE \n\033[m"
- wget "$URL" -P "$SRC_DIR/$PACKAGE"
- # Verifica se o
- if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m No such source file in $URL\n\033[m"
- exit $ERROR_WGET
- fi
+ wget "$URL" -P "$SRC_DIR/$PACKAGE" || exit $ERROR_WGET
fi
# ------------------ Checa md5sum -----------------------
if [ "$SRC_ORIG" = "$SRC" -o "$MD5" != "$MD5_ORIG" -a "$MD5" != "no" ]; then
SUM=`md5sum $SOURCE | awk '{print $1}'`
- if [ "$SUM" != "$MD5" ]; then
- echo -e "\n\n\033[01;31m MD5SUM error: run Slackbuild again \n\033[m"
- echo -e "\033[01;31m Remove $PACKAGE from $SRC_DIR and start Slackbuild again or use MD5=\"no\" \n\033[m"
- exit 0
- fi
- echo -e "\n\n\033[01;32m Md5sum Ok \n\033[m"
+ [ "$SUM" != "$MD5" ] && exit $ERROR_MD5
fi
# ----------------- ARCH e LIBDIR -----------------------
@@ -90,32 +79,15 @@ PKG_SRC=$TMP/$PACKAGE-source
rm -rf $PKG_SRC 2>/dev/null
mkdir -p $PKG_SRC
# Desempacota $SOURCE em $TMP/$PACKAGE-source
-tar xvf $SOURCE -C $PKG_SRC
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m $SOURCE file error \n\033[m"
- exit $ERROR_TAR
-fi
+tar xvf $SOURCE -C $PKG_SRC || exit $ERROR_TAR
+
# Pega o nome do diretório das fontes independente de sua
# estrutura (package-version...)
PKG_DIR="$PKG_SRC/$( ls $PKG_SRC/ )"
cd $PKG_DIR
-# -------------- Configura programa ---------------------
-# Configura programa
-#echo -e "\n\n\033[01;32m CFLAGS=\"$SLKCFLAGS\" ./configure --prefix=$PREFIX --libdir=$LIBDIR $OPTCONF \n\033[m"
-#CFLAGS="$SLKCFLAGS" ./configure --prefix=$PREFIX --libdir=$LIBDIR $OPTCONF
-#if [ $? -ne 0 -o "$OPTCONF" = "--help" ]; then
-# echo -e "\n\n\033[01;31m Configure error \n\033[m"
-# exit $ERROR_CONF
-#fi
-
# ---------------- Compila programa ---------------------
-echo -e "\n\n\033[01;32m make -j3 \n\033[m"
-make -j3
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m Build error \n\033[m"
- exit $ERROR_MAKE
-fi
+make -j3 || exit $ERROR_MAKE
# ------------- Diretório Temporário --------------------
# Cria diretório temporário para construção do pacote
@@ -125,12 +97,7 @@ mkdir -p $PKG
# --------------- Instala programa ----------------------
# Instala programa em diretório temporário
-echo -e "\n\n\033[01;32m PREFIX=SPKG/$PREFIX make install \n\033[m"
-PREFIX=$PKG/$PREFIX make install
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m Install error \n\033[m"
- exit $ERROR_INSTALL
-fi
+PREFIX=$PKG/$PREFIX make install || exit $ERROR_INSTALL
# ----------------- Stripa código -----------------------
cd $PKG
@@ -168,14 +135,9 @@ mkdir -p $PKG_DOC
cp $PKG_DIR/{COPYING,INSTALL} $PKG_DOC
# --------------- Constroi o pacote ---------------------
-echo -e "\n\n\033[01;32m makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz \n\033[m"
-makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz
-if [ $? -ne 0 ]; then
- exit $ERROR_MKPKG
-fi
+makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG
# ----------- Remove arquivos temporários ---------------
if [ "$CLEANUP" = "yes" ]; then
- echo -e "\n\n\033[01;32m Remove files... \n\033[m"
rm -rf $PKG $PKG_SRC
fi