diff options
-rwxr-xr-x | icecast/icecast.SlackBuild | 12 | ||||
-rwxr-xr-x | icecast/ices.SlackBuild | 64 | ||||
-rwxr-xr-x | icecast/libshout.SlackBuild | 67 |
3 files changed, 53 insertions, 90 deletions
diff --git a/icecast/icecast.SlackBuild b/icecast/icecast.SlackBuild index 5abc140d..d185cd95 100755 --- a/icecast/icecast.SlackBuild +++ b/icecast/icecast.SlackBuild @@ -305,18 +305,16 @@ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs st VERSION="`echo $VERSION | sed -e 's/-/_/g'`" makepkg --linkadd y --chown n $REPOS/$PRGNAM-$VERSION-$ARCH-$BUILD.tgz -(cd $REPOS && md5sum $PRGNAM-$VERSION-$ARCH-$BUILD.tgz > $PRGNAM-$VERSION-$ARCH-$BUILD.tgz.md5) -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $REPOS/$PRGNAM-$VERSION-$ARCH-$BUILD.txt + +#(cd $REPOS && md5sum $PRGNAM-$VERSION-$ARCH-$BUILD.tgz > $PRGNAM-$VERSION-$ARCH-$BUILD.tgz.md5) +#cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $REPOS/$PRGNAM-$VERSION-$ARCH-$BUILD.txt # --- CLEANUP --- # Clean up the extra stuff: -if [ "$1" = "--cleanup" ]; then - rm -rf $TMP/tmp-$PRGNAM - rm -rf $PKG -else - echo You can check the 'installwatch' log file: $TMP/install-${PRGNAM}.log +if [ "$CLEANUP" == "yes" ]; then + rm -rf $TMP fi # diff --git a/icecast/ices.SlackBuild b/icecast/ices.SlackBuild index d7857dda..79f0e289 100755 --- a/icecast/ices.SlackBuild +++ b/icecast/ices.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # slackbuild for ices by rhatto # based on http://www.slackware.com/~alien/slackbuilds/icecast/build/ices.SlackBuild @@ -6,12 +6,6 @@ CWD=`pwd` -PACKAGE="ices" -_VERSION="2.0.1" -_ARCH="i486" -_BUILD="1rha" -_TMP="/tmp" - if [ -f "/etc/slackbuildrc" ]; then source /etc/slackbuildrc fi @@ -20,17 +14,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="ices" +ARCH=${ARCH:=x86_64} +VERSION=${VERSION:=2.0.1} +BUILD=${BUILD:=1rha} +SRC_DIR=${SRC:=$CWD} +TMP=${TMP:=/tmp} +REPOS=${REPOS:=$TMP} if [ "$ARCH" == "x86_64" ]; then LIBDIR=/usr/lib64 @@ -38,22 +29,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 - PRGNAM="$PACKAGE" RTOOL="wget" PACKAGE_EXT="bz2" SRC="$PACKAGE-$VERSION.tar.$PACKAGE_EXT" URL="http://downloads.us.xiph.org/releases/$PACKAGE/$SRC" -PKG=$TMP/package-$PACKAGE if [ "$PACKAGE_EXT" == "bz2" ]; then tarflag="j" @@ -61,15 +41,19 @@ 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" fi -rm -rf $PKG $TMP/tmp-$PRGNAM -mkdir -p $TMP/tmp-$PRGNAM # location to build the source -mkdir -p $PKG # place for the package to be built +TMP="$TMP/$PACKAGE" +PKG=$TMP/package-$PACKAGE +rm -rf $TMP +mkdir -p $PKG +cd $TMP -cd $TMP/tmp-$PRGNAM tar xvpf$tarflag $SRC_DIR/$SRC cd $PRGNAM-$VERSION @@ -105,18 +89,16 @@ cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -makepkg --linkadd y --chown y $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.tgz -(cd $TMP && md5sum $PRGNAM-$VERSION-$ARCH-$BUILD.tgz > $PRGNAM-$VERSION-$ARCH-$BUILD.tgz.md5) -cat $CWD/${PRGNAM}.slack-desc | grep "^${PRGNAM}" > $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txt +makepkg --linkadd y --chown y $REPOS/$PRGNAM-$VERSION-$ARCH-$BUILD.tgz + +#(cd $REPOS && md5sum $PRGNAM-$VERSION-$ARCH-$BUILD.tgz > $REPOS-$VERSION-$ARCH-$BUILD.tgz.md5) +#cat $CWD/${PRGNAM}.slack-desc | grep "^${PRGNAM}" > $REPOS/$PRGNAM-$VERSION-$ARCH-$BUILD.txt # --- CLEANUP --- # Clean up the extra stuff: -if [ "$1" = "--cleanup" ]; then - rm -rf $TMP/tmp-$PRGNAM - rm -rf $PKG -else - echo You can check the 'installwatch' log file: $TMP/install-${PRGNAM}.log +if [ "$CLEANUP" == "yes" ]; then + rm -rf $TMP fi # diff --git a/icecast/libshout.SlackBuild b/icecast/libshout.SlackBuild index db7e63ea..06d954a7 100755 --- a/icecast/libshout.SlackBuild +++ b/icecast/libshout.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # $Id: libshout.SlackBuild,v 1.2 2006/02/28 15:26:52 root Exp root $ # Copyright (c) 2006 Eric Hameleers <alien@slackware.com> # Distributed under the terms of the GNU General Public License, Version 2 @@ -19,13 +19,6 @@ CWD=`pwd` -# default settings -PACKAGE="libshout" -_VERSION="2.2.1" -_ARCH="x86_64" -_BUILD="2rha" -_TMP="/tmp" - if [ -f "/etc/slackbuildrc" ]; then source /etc/slackbuildrc fi @@ -34,17 +27,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="libshout" +ARCH=${ARCH:=x86_64} +VERSION=${VERSION:=2.2.1} +BUILD=${BUILD:=2rha} +SRC_DIR=${SRC:=$CWD} +TMP=${TMP:=/tmp} +REPOS=${REPOS:=$TMP} if [ "$ARCH" == "x86_64" ]; then LIBDIR=/usr/lib64 @@ -52,19 +42,6 @@ else LIBDIR=/usr/lib fi -if [ -z "$SRC" ]; then - SRC_DIR="$CWD" -else - SRC_DIR="$SRC" -fi - -if [ -z "$TMP" ]; then - TMP="$_TMP" -fi - -PRGNAM="$PACKAGE" -PKG=$TMP/package-$PRGNAM - RTOOL="wget" PACKAGE_EXT="gz" SRC="$PACKAGE-$VERSION.tar.$PACKAGE_EXT" @@ -76,6 +53,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" @@ -90,6 +70,13 @@ fi # --- PACKAGE BUILDING --- +TMP="$TMP/$PACKAGE" +PRGNAM="$PACKAGE" +PKG=$TMP/package-$PRGNAM +rm -rf $TMP +mkdir -p $PKG +cd $TMP + echo "+==============+" echo "| $PRGNAM-$VERSION |" echo "+==============+" @@ -102,8 +89,6 @@ if [ -f $CWD/_$PRGNAM.tar.gz ]; then explodepkg $CWD/_$PRGNAM.tar.gz fi -cd $TMP/tmp-$PRGNAM - # Extract tar ball in TEMP dir echo Building $PRGNAM... tar xvpf$tarflag $SRC_DIR/$SRC @@ -148,18 +133,16 @@ cat $CWD/${PRGNAM}.slack-desc > $PKG/install/slack-desc # Build the package and compute its md5 checksum: cd $PKG -makepkg --linkadd y --chown n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.tgz -(cd $TMP && md5sum $PRGNAM-$VERSION-$ARCH-$BUILD.tgz > $PRGNAM-$VERSION-$ARCH-$BUILD.tgz.md5) -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txt +makepkg --linkadd y --chown n $REPOS/$PRGNAM-$VERSION-$ARCH-$BUILD.tgz + +#(cd $REPOS && md5sum $PRGNAM-$VERSION-$ARCH-$BUILD.tgz > $PRGNAM-$VERSION-$ARCH-$BUILD.tgz.md5) +#cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $REPOS/$PRGNAM-$VERSION-$ARCH-$BUILD.txt # --- CLEANUP --- # Clean up the extra stuff: -if [ "$1" = "--cleanup" ]; then - rm -rf $TMP/tmp-$PRGNAM - rm -rf $PKG -else - echo You can check the 'installwatch' log file: $TMP/${PRGNAM}_install.log +if [ "$CLEANUP" == "yes" ]; then + rm -rf $TMP fi # |