From 7b435b9e24bdc4e027adb9fa66d2de0b58202e05 Mon Sep 17 00:00:00 2001 From: rudson Date: Sat, 2 Dec 2006 23:09:35 +0000 Subject: 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 --- app/emulation/kqemu/kqemu.SlackBuild | 49 ++++++------------------------------ 1 file changed, 7 insertions(+), 42 deletions(-) (limited to 'app/emulation/kqemu') 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 -- cgit v1.2.3