network/wifi-radar: Updated for version 1.9.9

6 files changed, 26 insertions, 26 deletions

diff --git a/network/wifi-radar/README b/network/wifi-radar/README
index df36d8664b..20d405a221 100644
--- a/network/wifi-radar/README
+++ b/network/wifi-radar/README
@@ -4,9 +4,6 @@ networks. At boot time, running WiFi Radar will automatically scan for an
 available preferred network and connect to it. You can drag and drop your 
 preferred networks to arrange the profile priority.
 
-This requires pygtk, which in turn requires pygobject and pycairo, all of 
-which are also available at SlackBuilds.org
-
 This script installs a wifi-radar.sh script in /usr/bin that by default 
 runs /usr/sbin/wifi-radar with sudo.  You can change this to use ksudo 
 instead by running the script thusly:
@@ -33,7 +30,9 @@ Please note that according to the manpage, wifi-radar is fairly power hungry
 due to its constant scan nature.  You may not wish to have it running in the 
 background all the time sucking battery juice.
 
-Make sure /etc/wifi-radar/wifi-radar.conf is only readable by root (or perhaps
-the group that owns it in some cases).  We install the file with mode 0600 by
+Make sure /etc/wifi-radar.conf is only readable by root (or perhaps the
+group that owns it in some cases).  We install the file with mode 0600 by
 default, but this was not the case in some earlier revisions, so you should
-double-check it to be sure.
+double-check it to be sure. As of version 1.9.9 the config file is now 
+/etc/wifi-radar.conf, if you are upgrading you need to move you old config
+file to /etc. 
\ No newline at end of file
diff --git a/network/wifi-radar/doinst.sh b/network/wifi-radar/doinst.sh
index 1074af329f..e1eb1f5802 100644
--- a/network/wifi-radar/doinst.sh
+++ b/network/wifi-radar/doinst.sh
@@ -10,8 +10,8 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-if [ -x usr/bin/update-desktop-database ]; then
-  usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
 fi
 
 # Keep same perms on rc.wifi-radar.new:
@@ -21,10 +21,10 @@ if [ -e etc/rc.d/rc.wifi-radar ]; then
   mv etc/rc.d/rc.wifi-radar.new.incoming etc/rc.d/rc.wifi-radar.new
 fi
 
-config etc/wifi-radar/wifi-radar.conf.new
+config etc/wifi-radar.conf.new
 config etc/rc.d/rc.wifi-radar.new
 
-echo "Remember to edit /etc/wifi-radar/wifi-radar.conf to suit your needs..."
+echo "Remember to edit /etc/wifi-radar.conf to suit your needs..."
 echo 
 echo "To use wifi-radar with a normal user (with sudo) add:"
 echo "%users   ALL = NOPASSWD: /usr/sbin/wifi-radar"
diff --git a/network/wifi-radar/rc.wifi-radar b/network/wifi-radar/rc.wifi-radar
index 014d9d9bd9..488f148086 100644
--- a/network/wifi-radar/rc.wifi-radar
+++ b/network/wifi-radar/rc.wifi-radar
@@ -11,7 +11,7 @@ PIDFILE=/var/run/wifi.pid
 start() {
   # use the forced interface found in rc.inet1.conf or guess it
   [ ! "$INTERFACE" ] && INTERFACE="$(iwconfig 2>/dev/null | grep ESSID | head -n1 | cut -d " " -f 1)"
-  sed -i "s/^[ \t]*interface[ \t]*=[ \t]*.*/interface = $INTERFACE/" /etc/wifi-radar/wifi-radar.conf
+  sed -i "s/^[ \t]*interface[ \t]*=[ \t]*.*/interface = $INTERFACE/" /etc/wifi-radar.conf
 
   if [ -e "${PIDFILE}" ]; then
     echo "Found existing ${PIDFILE}! Stopping first before starting"
diff --git a/network/wifi-radar/slack-desc b/network/wifi-radar/slack-desc
index 3c1b88852a..26e5b6ae0b 100644
--- a/network/wifi-radar/slack-desc
+++ b/network/wifi-radar/slack-desc
@@ -5,7 +5,7 @@
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
 
-          |-----handy-ruler---------------------------------------------------|
+          |-----handy-ruler--------------------------------------------------|
 wifi-radar: Wifi Radar (Python/PyGTK2 utility for managing WiFi profiles)
 wifi-radar: 
 wifi-radar: WiFi Radar is a Python/PyGTK2 utility for managing WiFi profiles.
diff --git a/network/wifi-radar/wifi-radar.SlackBuild b/network/wifi-radar/wifi-radar.SlackBuild
index 38e94276e2..3652a071c9 100644
--- a/network/wifi-radar/wifi-radar.SlackBuild
+++ b/network/wifi-radar/wifi-radar.SlackBuild
@@ -22,9 +22,9 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wifi-radar
-VERSION=${VERSION:-1.9.8}
+VERSION=${VERSION:-1.9.9}
 ARCH=noarch
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -42,10 +42,12 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
-
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
-
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
 sed -i -e 's|etc/init.d|etc/rc.d|g' Makefile
 sed -i -e 's|auto_detect||g' wifi-radar.conf
 
@@ -56,18 +58,17 @@ else
 fi
 
 make 
-
 # Install everything manually
 install -D -m 0755 wifi-radar.localized   $PKG/usr/sbin/wifi-radar
 install -D -m 0644 wifi-radar.1           $PKG/usr/man/man1/wifi-radar.1
 install -D -m 0644 wifi-radar.conf.5      $PKG/usr/man/man5/wifi-radar.conf.5
-install -D -m 0755 $CWD/rc.wifi-radar   $PKG/etc/rc.d/rc.wifi-radar.new
+install -D -m 0755 $CWD/rc.wifi-radar     $PKG/etc/rc.d/rc.wifi-radar.new
 install -D -m 0644 pixmaps/wifi-radar.svg $PKG/usr/share/pixmaps/wifi-radar.svg
 install -D -m 0644 pixmaps/wifi-radar.png $PKG/usr/share/pixmaps/wifi-radar.png
 install -D -m 0644 wifi-radar.desktop     $PKG/usr/share/applications/wifi-radar.desktop 
-install -D -m 0644 $CWD/slack-desc      $PKG/install/slack-desc
-install -D -m 0744 $CWD/doinst.sh       $PKG/install/doinst.sh
-install -D -m 0600 wifi-radar.conf        $PKG/etc/wifi-radar/wifi-radar.conf.new
+install -D -m 0644 $CWD/slack-desc        $PKG/install/slack-desc
+install -D -m 0744 $CWD/doinst.sh         $PKG/install/doinst.sh
+install -D -m 0600 wifi-radar.conf        $PKG/etc/wifi-radar.conf.new
 install -D -m 0755 wifi-radar.sh          $PKG/usr/bin/wifi-radar.sh
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/network/wifi-radar/wifi-radar.info b/network/wifi-radar/wifi-radar.info
index e71d727bd4..d60adabcbf 100644
--- a/network/wifi-radar/wifi-radar.info
+++ b/network/wifi-radar/wifi-radar.info
@@ -1,8 +1,8 @@
 PRGNAM="wifi-radar"
-VERSION="1.9.8"
+VERSION="1.9.9"
 HOMEPAGE="http://wifi-radar.systemimager.org"
-DOWNLOAD="http://wifi-radar.systemimager.org/pub/wifi-radar-1.9.8.tar.bz2"
-MD5SUM="827cc9974298afefd143e9aaf15f95cc"
+DOWNLOAD="http://wifi-radar.systemimager.org/pub/wifi-radar-1.9.9.tar.bz2"
+MD5SUM="fdcf862da67e0624dcca5d71d12caddf"
 MAINTAINER="David Somero"
 EMAIL="dsomero@hotmail.com "
-APPROVED="Alan_Hicks"
+APPROVED="rworkman"