system/rover: Updated for version 0.4.2.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

5 files changed, 103 insertions, 27 deletions

diff --git a/system/rover/README b/system/rover/README
index 8789dd1ff2..452a67aef5 100644
--- a/system/rover/README
+++ b/system/rover/README
@@ -3,19 +3,10 @@ Rover is a file browser for the terminal.
 The main goal is to provide a faster way to explore a file system from
 the terminal, compared to what's possible by using cd, ls, etc. Rover
 has vi-like key bindings for navigation and can open files in $PAGER
-and $EDITOR. Basic file system operations are also implemented Rover 
+and $EDITOR. Basic file system operations are also implemented. Rover
 is designed to be simple, fast and portable.
 
 CUSTOMIZATION
 -------------
-To customize rover edit config.h in the source tarball and
-place it in the config directory before running the script.
-
-Example:
-
-$ cd rover-0.4.0
-$ vi config.h
-[make customizations]
-$ cp -a config.h ../config/
-$ cd ..
-# ./rover.SlackBuild
\ No newline at end of file
+To customize rover, edit config.h in the SlackBuild directory before
+running the SlackBuild.
diff --git a/system/rover/config.h b/system/rover/config.h
new file mode 100644
index 0000000000..d49d284205
--- /dev/null
+++ b/system/rover/config.h
@@ -0,0 +1,81 @@
+#define RV_VERSION      "0.4.2"
+
+/* CTRL+X: "^X"
+   ALT+X: "M-X" */
+#define RVK_QUIT        "q"
+#define RVK_HELP        "?"
+#define RVK_DOWN        "j"
+#define RVK_UP          "k"
+#define RVK_JUMP_DOWN   "J"
+#define RVK_JUMP_UP     "K"
+#define RVK_JUMP_TOP    "g"
+#define RVK_JUMP_BOTTOM "G"
+#define RVK_CD_DOWN     "l"
+#define RVK_CD_UP       "h"
+#define RVK_HOME        "H"
+#define RVK_TARGET      "t"
+#define RVK_REFRESH     "r"
+#define RVK_SHELL       "^M"
+#define RVK_VIEW        " "
+#define RVK_EDIT        "e"
+#define RVK_OPEN        "o"
+#define RVK_SEARCH      "/"
+#define RVK_TG_FILES    "f"
+#define RVK_TG_DIRS     "d"
+#define RVK_TG_HIDDEN   "s"
+#define RVK_NEW_FILE    "n"
+#define RVK_NEW_DIR     "N"
+#define RVK_RENAME      "R"
+#define RVK_DELETE      "D"
+#define RVK_TG_MARK     "m"
+#define RVK_INVMARK     "M"
+#define RVK_MARKALL     "a"
+#define RVK_MARK_DELETE "X"
+#define RVK_MARK_COPY   "C"
+#define RVK_MARK_MOVE   "V"
+
+/* Colors available: DEFAULT, RED, GREEN, YELLOW, BLUE, CYAN, MAGENTA, WHITE, BLACK. */
+#define RVC_CWD         GREEN
+#define RVC_STATUS      CYAN
+#define RVC_BORDER      BLUE
+#define RVC_SCROLLBAR   CYAN
+#define RVC_LINK        CYAN
+#define RVC_HIDDEN      YELLOW
+#define RVC_EXEC        GREEN
+#define RVC_REG         DEFAULT
+#define RVC_DIR         DEFAULT
+#define RVC_CHR         MAGENTA
+#define RVC_BLK         MAGENTA
+#define RVC_FIFO        BLUE
+#define RVC_SOCK        MAGENTA
+#define RVC_PROMPT      DEFAULT
+#define RVC_TABNUM      DEFAULT
+#define RVC_MARKS       YELLOW
+
+/* Special symbols used by the TUI. See <curses.h> for available constants. */
+#define RVS_SCROLLBAR   ACS_CKBOARD
+#define RVS_MARK        ACS_DIAMOND
+
+/* Prompt strings for line input. */
+#define RV_PROMPT(S)    S ": "
+#define RVP_SEARCH      RV_PROMPT("search")
+#define RVP_NEW_FILE    RV_PROMPT("new file")
+#define RVP_NEW_DIR     RV_PROMPT("new dir")
+#define RVP_RENAME      RV_PROMPT("rename")
+
+/* Number of entries to jump on RVK_JUMP_DOWN and RVK_JUMP_UP. */
+#define RV_JUMP         10
+
+/* Optional macro to be executed when a batch operation finishes. */
+#define RV_ALERT()      beep()
+
+/* Shell used to launch external  programs.
+   Defining   this  macro   will  force   Rover  to   launch  external
+   programs with  `sh -c  "$EXTERNAL_PROGRAM [arg]"`. This  gives more
+   flexibility,  allowing command-line  arguments  to  be embedded  in
+   environment variables  (e.g. PAGER="less  -N"). On the  other hand,
+   this requires the presence of a  shell and will spawn an additional
+   process each time an external  program is invoked. Leave this macro
+   undefined if you prefer external  programs to be launched with just
+   `$EXTERNAL_PROGRAM [arg]`. */
+#define RV_SHELL        "/bin/sh"
diff --git a/system/rover/pathname.diff.gz b/system/rover/pathname.diff.gz
new file mode 100644
index 0000000000..001d700d8e
--- /dev/null
+++ b/system/rover/pathname.diff.gz
diff --git a/system/rover/rover.SlackBuild b/system/rover/rover.SlackBuild
index d46ade4cc5..fcecebd3f5 100644
--- a/system/rover/rover.SlackBuild
+++ b/system/rover/rover.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for rover
 
-# Copyright 2015 Hunter Sezen California, USA
+# Copyright 2015-2016 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=rover
-VERSION=${VERSION:-0.4.0}
+VERSION=${VERSION:-0.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -70,12 +70,16 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Allows using a custom config.h with rover
-if [ "$(ls $CWD/config)" ]; then
-    for i in $(ls $CWD/config); do
-       cp -a $CWD/config/config.h config.h
-    done
+if [ -f $CWD/config,h ]; then
+  cp -a $CWD/config.h config.h
 fi
 
+# Fix pathname splitting when running external programs.
+# Also escape single quotes inside shell argument.
+# https://github.com/lecram/rover/commit/486a1459319a656b0b4b218c6451e629858d6060
+# https://github.com/lecram/rover/commit/21152dd558248363f497649e01611fccbb89f974
+zcat $CWD/pathname.diff.gz | patch -p1
+
 make CFLAGS="$SLKCFLAGS"
 make install \
   PREFIX=/usr \
@@ -88,7 +92,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES.md README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/rover/rover.info b/system/rover/rover.info
index 44976fc036..718f3284d7 100644
--- a/system/rover/rover.info
+++ b/system/rover/rover.info
@@ -1,10 +1,10 @@
 PRGNAM="rover"
-VERSION="0.4.0"
+VERSION="0.4.2"
 HOMEPAGE="https://github.com/lecram/rover"
-DOWNLOAD="https://github.com/lecram/rover/archive/v0.4.0.tar.gz"
-MD5SUM="ebb4298ffc76b6d48ce62d78eff8ef42"
+DOWNLOAD="https://github.com/lecram/rover/archive/v0.4.2/rover-0.4.2.tar.gz"
+MD5SUM="02b7578e406895771555c912cb584d48"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Hunter Sezen"
-EMAIL="ovariegata@yahoo.com"
\ No newline at end of file
+EMAIL="ovariegata@yahoo.com"