lm_sensors update

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

diff --git a/libiconv/libiconv.SlackBuild b/libiconv/libiconv.SlackBuild
index c01e62777e0a0099de91ea5a2827fe84b4d5800c..e2345fb938e27859660d6e5319284563ed781388 100755 (executable)
--- a/libiconv/libiconv.SlackBuild
+++ b/libiconv/libiconv.SlackBuild
@@ -51,7 +51,6 @@ rm -rf $TMP
 mkdir -p $TMP
 cd $TMP
 
-rm -rf package-$PACKAGE
 mkdir package-$PACKAGE
 cd package-$PACKAGE
 

diff --git a/lm_sensors/lm_sensors.SlackBuild b/lm_sensors/lm_sensors.SlackBuild
index 24ea60305c3a3ce1e9ccc22a9b754ce425f72745..1873e4dbb33a7bb74009a5e250c439b2ce301700 100755 (executable)
--- a/lm_sensors/lm_sensors.SlackBuild
+++ b/lm_sensors/lm_sensors.SlackBuild
@@ -6,14 +6,6 @@
 
 CWD=`pwd`
 
-# default settings
-PRGNAM="lm_sensors"
-PACKAGE="$PRGNAM"
-_VERSION="2.9.1"
-_ARCH="x86_64"
-_BUILD="3rha"
-_TMP="/tmp"
-
 if [ -f "/etc/slackbuildrc" ]; then
   source /etc/slackbuildrc
 fi
@@ -22,27 +14,15 @@ 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
-
-if [ -z "$SRC" ]; then
-  SRC_DIR="$CWD"
-else
-  SRC_DIR="$SRC"
-fi
-
-if [ -z "$TMP" ]; then
-  TMP="$_TMP"
-fi
+# default settings
+PRGNAM="lm_sensors"
+PACKAGE="$PRGNAM"
+ARCH=${ARCH:=x86_64}
+VERSION=${VERSION:=2.9.1}
+BUILD=${BUILD:=3rha}
+SRC_DIR=${SRC:=$CWD}
+TMP=${TMP:=/tmp}
+REPOS=${REPOS:=$TMP}
 
 PACKAGE_EXT="gz"
 SRC="$PACKAGE-$VERSION.tar.$PACKAGE_EXT"
@@ -113,6 +93,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.asc" -O "$SRC_DIR/$SRC.asc"
@@ -120,6 +103,9 @@ fi
 
 gpg --verify $SRC_DIR/$SRC.asc $SRC_DIR/$SRC || echo WARNING: Could not check signature or WRONG signature found.
 
+TMP="$TMP/$PACKAGE"
+rm -rf $TMP
+mkdir -p $TMP
 cd $TMP
 
 rm -rf $PACKAGE-$VERSION $PACKAGE-$VERSION-$ARCH-$BUILD.tgz
@@ -176,7 +162,9 @@ mv etc/sensors.conf etc/sensors.conf.new
 mkdir -p usr/doc/$PACKAGE-$VERSION
 cp $CWD/{BACKGROUND,BUGS,CHANGES,CONTRIBUTORS,COPYING,INSTALL,QUICKSTART,README,README.thinkpad,TODO} usr/doc/$PACKAGE-$VERSION/
 
-makepkg -c y -l y $TMP/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz
+makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz
 
-rm -rf $TMP/$PACKAGE-$VERSION
+if [ "$CLEANUP" == "yes" ]; then
+  rm -rf $TMP
+fi