misc/biosdisk: Updated for version 0.75_2

5 files changed, 37 insertions, 38 deletions

diff --git a/misc/biosdisk/README b/misc/biosdisk/README
index 1451d149fac5..772fb9b36881 100644
--- a/misc/biosdisk/README
+++ b/misc/biosdisk/README
@@ -1,7 +1,7 @@
-Those bunch of scripts are creating disk images with freedos and autoexec.bat
-to automatically run the bios .exe.
+biosdisk is a bunch of scripts are creating disk images with freedos and 
+autoexec.bat to automatically run the bios executable.
 
-I suppose is suitable for any update of firmware or BIOS that can run from
+It should be suitable for any update of firmware or BIOS that can run from
 diskette and freeDOS.
 
-You can create with mkisofs cd iso image that contains the floppy image.
+You can create (with mkisofs) a cd iso image that contains the floppy image.
diff --git a/misc/biosdisk/biosdisk.SlackBuild b/misc/biosdisk/biosdisk.SlackBuild
index 94c24342e725..33fca83d60ad 100644
--- a/misc/biosdisk/biosdisk.SlackBuild
+++ b/misc/biosdisk/biosdisk.SlackBuild
@@ -1,58 +1,54 @@
 #!/bin/sh
 # Slackware build script for <biosdisk>
 # Written by Michales Michaloudes korgie@gmail.com
-# Modified by SlackBuilds.org
-
-# Exit on most errors
-set -e
 
 PRGNAM=biosdisk
 VERSION=0.75
-ARCH=${ARCH:-noarch}
-BUILD=${BUILD:-1}
+ARCH=noarch
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+
+SRC_VERSION=${VERSION}-2
+
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
+TMP=${TMP:-/tmp/SBo}	
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-fi
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION-2.tar.gz || exit 1
+tar xvf $CWD/$PRGNAM-$SRC_VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-mkdir -p $PKG/var/lib/biosdisk
-mkdir -p $PKG/usr/share/biosdisk
-mkdir -p $PKG/etc/
-mkdir -p $PKG/usr/man/man8/
-mkdir -p $PKG/usr/sbin
+# Procedure taken from the original install.sh by Dell.
+# Added $PKG variable for package creation.
+
+# I think this is useless. Checks for wget, unix2dos (slackware has todos)
+# syslinux, python
+# sh checkdeps.sh
+#install -D -m 0755 geturl $PKG/usr/sbin/geturl
 
-cd $TMP/$PRGNAM-$VERSION
-install -m 755 biosdisk $PKG/usr/sbin/
-install -m 755 blconf $PKG/usr/sbin/
-install -m 755 geturl $PKG/usr/sbin/
-install -m 644 dosdisk.img $PKG/usr/share/biosdisk/
-install -m 644 biosdisk.conf $PKG/etc/biosdisk.conf.new
-install -m 644 biosdisk.8.gz $PKG/usr/man/man8
+install -D -m 0755 biosdisk $PKG/usr/sbin/biosdisk
+install -D -m 0755 blconf $PKG/usr/sbin/blconf
+install -D -m 0644 biosdisk.8.gz $PKG/usr/man/man8/biosdisk.8.gz
+install -D -m 0644 dosdisk.img $PKG/usr/share/biosdisk/dosdisk.img
+install -D -m 0644 biosdisk.conf $PKG/etc/biosdisk.conf.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cd $TMP/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL TODO README README.dosdisk VERSION $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog INSTALL TODO README README.dosdisk VERSION \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/misc/biosdisk/biosdisk.info b/misc/biosdisk/biosdisk.info
index b6c164347a13..be5f9f5f492d 100644
--- a/misc/biosdisk/biosdisk.info
+++ b/misc/biosdisk/biosdisk.info
@@ -1,8 +1,10 @@
 PRGNAM="biosdisk"
-VERSION="0.75"
+VERSION="0.75_2"
 HOMEPAGE="http://linux.dell.com/biosdisk/"
 DOWNLOAD="http://linux.dell.com/biosdisk/biosdisk-0.75-2.tar.gz"
 MD5SUM="8add054007966fc176042bff92ee417c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Michales Michaloudes"
 EMAIL="korgie@gmail.com"
-APPROVED="Erik Hanson"
+APPROVED="rworkman"
diff --git a/misc/biosdisk/doinst.sh b/misc/biosdisk/doinst.sh
index c19353793169..0b3c315f57d3 100644
--- a/misc/biosdisk/doinst.sh
+++ b/misc/biosdisk/doinst.sh
@@ -1,10 +1,10 @@
 config() {
   NEW="$1"
-  OLD="`dirname $NEW`/`basename $NEW .new`"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
   # If there's no config file by that name, mv it over:
   if [ ! -r $OLD ]; then
     mv $NEW $OLD
-  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
     # toss the redundant copy
     rm $NEW
   fi
@@ -12,3 +12,4 @@ config() {
 }
 
 config etc/biosdisk.conf.new
+
diff --git a/misc/biosdisk/slack-desc b/misc/biosdisk/slack-desc
index 49db7dba8f43..47025881d2f9 100644
--- a/misc/biosdisk/slack-desc
+++ b/misc/biosdisk/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-biosdisk: biosdisk (create bootable BIOS flash images)
+biosdisk: biosdisk (system BIOS flash utility)
 biosdisk:
 biosdisk: biosdisk simplifies the process of flashing your system BIOS under
 biosdisk: Linux on Dell desktops and laptops. The purpose of this utility is to