aboutsummaryrefslogtreecommitdiff
path: root/app
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 /app
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 'app')
-rwxr-xr-xapp/admin/hddtemp/hddtemp.SlackBuild50
-rwxr-xr-xapp/arch/cabextract/cabextract.SlackBuild51
-rwxr-xr-xapp/cdr/k9copy/k9copy.SlackBuild50
-rwxr-xr-xapp/editors/kile/kile.SlackBuild50
-rwxr-xr-xapp/emulation/kqemu/kqemu.SlackBuild49
-rwxr-xr-xapp/emulation/qemu/qemu.SlackBuild50
-rwxr-xr-xapp/emulation/wine/wine.SlackBuild57
-rwxr-xr-xapp/office/broffice/broffice.SlackBuild39
8 files changed, 65 insertions, 331 deletions
diff --git a/app/admin/hddtemp/hddtemp.SlackBuild b/app/admin/hddtemp/hddtemp.SlackBuild
index d5cc593d..6a1bd6b0 100755
--- a/app/admin/hddtemp/hddtemp.SlackBuild
+++ b/app/admin/hddtemp/hddtemp.SlackBuild
@@ -48,24 +48,13 @@ URL=${URL:="http://www.guzu.net/files/$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 -----------------------
@@ -91,11 +80,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/ )"
@@ -103,20 +89,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
@@ -126,12 +102,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 +139,9 @@ mkdir -p $PKG_DOC
cp $PKG_DIR/{ABOUT-NLS,AUTHORS,COPYING,ChangeLog,GPL-2,INSTALL,LICENSE,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/app/arch/cabextract/cabextract.SlackBuild b/app/arch/cabextract/cabextract.SlackBuild
index 2c71377e..071cae74 100755
--- a/app/arch/cabextract/cabextract.SlackBuild
+++ b/app/arch/cabextract/cabextract.SlackBuild
@@ -47,24 +47,13 @@ URL=${URL:="http://www.kyz.uklinux.net/downloads/$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
-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
@@ -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/$PREFIX/man/*
@@ -169,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/app/cdr/k9copy/k9copy.SlackBuild b/app/cdr/k9copy/k9copy.SlackBuild
index 1b611ba9..9a0a66e0 100755
--- a/app/cdr/k9copy/k9copy.SlackBuild
+++ b/app/cdr/k9copy/k9copy.SlackBuild
@@ -53,24 +53,13 @@ URL=${URL:="http://ufpr.dl.sourceforge.net/sourceforge/k9copy/$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
@@ -174,14 +145,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/app/editors/kile/kile.SlackBuild b/app/editors/kile/kile.SlackBuild
index f75551c5..59d24ca2 100755
--- a/app/editors/kile/kile.SlackBuild
+++ b/app/editors/kile/kile.SlackBuild
@@ -47,24 +47,13 @@ URL=${URL:="http://ufpr.dl.sourceforge.net/sourceforge/kile/$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/{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/app/emulation/kqemu/kqemu.SlackBuild b/app/emulation/kqemu/kqemu.SlackBuild
index a6d266e4..c13f6160 100755
--- a/app/emulation/kqemu/kqemu.SlackBuild
+++ b/app/emulation/kqemu/kqemu.SlackBuild
@@ -56,24 +56,13 @@ SOURCE=$SRC_DIR/qemu/$SRC
mkdir -p $SRC_DIR/qemu 2>/dev/null
# 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/qemu/"
- # 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/qemu/" || 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 -----------------------
@@ -99,11 +88,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 2>/dev/null
-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/ )"
@@ -111,20 +97,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 0
-fi
+make -j3 || exit $ERROR_MAKE
# ------------- Diretório Temporário --------------------
# Cria diretório temporário para construção do pacote
@@ -133,10 +109,6 @@ rm -rf $PKG
mkdir -p $PKG
# --------------- Instala programa ----------------------
-# #### Instalação de binários #####
-# Instala programa em diretório temporário
-echo -e "\n\n\033[01;32m Install $PACKAGE in $PKG \n\033[m"
-
# Find module name
if [ -f kqemu.ko ] ; then
MODULE=kqemu.ko
@@ -159,8 +131,6 @@ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs st
# ---------------- Cria doinstall ----------------------
# Script de instalação
mkdir $PKG/install
-
-echo -e "\n\n\033[01;32m doinst.sh \n\033[m"
cat << EOF_DONINST > install/doinst.sh
#!/bin/sh
set +e
@@ -219,14 +189,9 @@ mkdir -p $PKG_DOC
cp $PKG_DIR/{Changelog,LICENSE,README} $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"_"$KVERSION-$ARCH-$BUILD.tgz
-if [ $? -ne 0 ]; then
- exit $ERROR_MKPKG
-fi
+makepkg -c y -l y $REPOS/$PACKAGE-$VERSION"_"$KVERSION-$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/app/emulation/qemu/qemu.SlackBuild b/app/emulation/qemu/qemu.SlackBuild
index b0b6df9d..4a91431e 100755
--- a/app/emulation/qemu/qemu.SlackBuild
+++ b/app/emulation/qemu/qemu.SlackBuild
@@ -47,24 +47,13 @@ URL=${URL:="http://fabrice.bellard.free.fr/qemu/$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 $ERROR_MD5
- 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 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
@@ -125,16 +101,11 @@ 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 prefix=$PKG/$PREFIX \
bindir=$PKG/$PREFIX/bin \
mandir=$PKG/$PREFIX/man \
datadir=$PKG/$PREFIX/share/qemu \
- docdir=$PKG/$PREFIX/doc/qemu-$VERSION
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m Install error \n\033[m"
- exit $ERROR_INSTALL
-fi
+ docdir=$PKG/$PREFIX/doc/qemu-$VERSION || exit $ERROR_INSTALL
# ------------------- gzip manuais ------------------------
gzip -r $PKG/$PREFIX/man/*
@@ -175,14 +146,9 @@ mkdir -p $PKG_DOC
cp $PKG_DIR/{COPYING,COPYING.LIB,Changelog,LICENSE,README,README.distrib,TODO,VERSION} $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/app/emulation/wine/wine.SlackBuild b/app/emulation/wine/wine.SlackBuild
index 6dffa03e..ec654530 100755
--- a/app/emulation/wine/wine.SlackBuild
+++ b/app/emulation/wine/wine.SlackBuild
@@ -47,24 +47,13 @@ URL=${URL:="http://ibiblio.org/pub/linux/system/emulators/wine/$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,25 +88,11 @@ 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 depend
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m Build error \n\033[m"
- exit $ERROR_MAKE
-fi
-make
-if [ $? -ne 0 ]; then
- echo -e "\n\n\033[01;31m Build error \n\033[m"
- exit $ERROR_MAKE
-fi
+make depend || exit $ERROR_MAKE
+make || exit $ERROR_MAKE
# ------------- Diretório Temporário --------------------
# Cria diretório temporário para construção do pacote
@@ -130,12 +102,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 $PKG/$PREFIX/share/man/man1/*
@@ -176,14 +144,9 @@ mkdir -p $PKG_DOC/documentation/
cp $PKG_DIR/documentation/* $PKG_DOC/documentation/
# --------------- 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/app/office/broffice/broffice.SlackBuild b/app/office/broffice/broffice.SlackBuild
index 3ef76129..72b9f3ee 100755
--- a/app/office/broffice/broffice.SlackBuild
+++ b/app/office/broffice/broffice.SlackBuild
@@ -48,24 +48,13 @@ SOURCE=$SRC_DIR/$PACKAGE/$SRC
mkdir -p $SRC_DIR/$PACKAGE 2>/dev/null
# 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 $ERROR_MD5
- fi
- echo -e "\n\n\033[01;32m Md5sum Ok \n\033[m"
+ [ "$SUM" != "$MD5" ] && exit $ERROR_MD5
fi
# -------------- Desempacota fontes ---------------------
@@ -74,28 +63,22 @@ 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"
cd $PKG_DIR/RPMS
# Converte pacotes rpm para tgz
-echo -e "\n\n\033[01;32m Converte rpm packages \n\033[m"
ALLPKGS=$( ls *.rpm | wc -l )
j=1
for i in *.rpm; do
- echo -e "\033[01;33m [$j of $ALLPKGS] Convert $i...\033[m"
rpm2tgz $i
let j++
done
rm *.rpm 2>/dev/null
# Converte links do KDE
cd desktop-integration
-echo -e "\033[01;33m Convert broffice.org-suse-menus...\033[m"
rpm2tgz broffice.org-suse-menus*.rpm
rm *.rpm *.deb 2>/dev/null
@@ -105,14 +88,11 @@ rm -rf $PKG 2>/dev/null
mkdir -p $PKG
# Instala arquivos em $PKG_VERSION
-echo -e "\n\n\033[01;32m Install packages \n\033[m"
-echo -e "\033[01;33m Install broffice.org-suse-menus...\033[m"
-tar xvf $( ls *.tgz ) -C $PKG
+tar xvf $( ls *.tgz ) -C $PKG || exit $ERROR_TAR
cd ..
j=1
for i in *.tgz; do
- echo -e "\033[01;33m [$j of $ALLPKGS] Install $i...\033[m"
- tar xvf $i -C $PKG
+ tar xvf $i -C $PKG || exit $ERROR_TAR
rm $i
let j++
done
@@ -182,14 +162,9 @@ cp $PKG_SRC/licenses/* $PKG_DOC
cp $PKG_SRC/readmes/* $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