summaryrefslogtreecommitdiff
path: root/wrapper
diff options
context:
space:
mode:
Diffstat (limited to 'wrapper')
-rw-r--r--wrapper/main.mk.in13
-rw-r--r--wrapper/rvs.sh9
2 files changed, 12 insertions, 10 deletions
diff --git a/wrapper/main.mk.in b/wrapper/main.mk.in
index 4de7eb8..0ba00d7 100644
--- a/wrapper/main.mk.in
+++ b/wrapper/main.mk.in
@@ -17,13 +17,16 @@ ver = 0.9
# along with this program; see the file COPYING.
# If not, see <http://www.gnu.org/licenses>.
-sysconfdir ?= @sysconfdir@
-BINDIR ?= @BINDIR@
-TMPDIR ?= @TMPDIR@
-LIBDIR ?= @LIBDIR@
-ETCDIR ?= @ETCDIR@
+sysconfdir = @sysconfdir@
+BINDIR = @BINDIR@
+TMPDIR = @TMPDIR@
+LIBDIR = @LIBDIR@
+ETCDIR = @ETCDIR@
dirs += $(sysconfdir) $(BINDIR) $(TMPDIR) $(LIBDIR) $(ETCDIR)
+rvs = @rvs@
+RVS = @RVS@
+
# phony targets ####################################################
.PHONY : all
all : Makefiles rvs
diff --git a/wrapper/rvs.sh b/wrapper/rvs.sh
index 85586ea..d8b1b40 100644
--- a/wrapper/rvs.sh
+++ b/wrapper/rvs.sh
@@ -67,7 +67,7 @@ _runcom() {
else
if [ -f "$BINDIR/$command" ]; then
exec "$BINDIR/$command" $@ | tee "$TMPDIR/$command"
- elif [ -d "$BINDIR/$command" ]
+ elif [ -d "$BINDIR/$command" ]; then
for file in "$BINDIR/$command"/*; do
id=$(echo $file | sed 's/^[0-9]*-//')
exec "$file" $@ | tee "TMPDIR/$command/$id"
@@ -105,16 +105,15 @@ _init() {
################################################################################
_install() {
- file= ${1?"usage: $RVS install FILE COMMAND ID [PRIORITY]"}
- command= ${2?"usage: $RVS install FILE COMMAND ID [PRIORITY]"}
- id= ${3?"usage: $RVS install FILE COMMAND ID [PRIORITY]"}
+ file=${1?"usage: $RVS install FILE COMMAND ID [PRIORITY]"}
+ command=${2?"usage: $RVS install FILE COMMAND ID [PRIORITY]"}
+ id=${3?"usage: $RVS install FILE COMMAND ID [PRIORITY]"}
priority=${4-"`_nextpriority "$command"`"}
install -d "$BINDIR/$command"
install "$file" "$BINDIR/$command/$priority-$id"
}
-
_uninstall() {
command=${1?"usage: $RVS uninstall COMMAND [ID]"}
id=$2