I don't think this will run, but I think the next step is to turn `rvs.sh' into

`rvs.c', so I'm going to go ahead and commit this.

4 files changed, 26 insertions, 160 deletions

diff --git a/plugins/repo/Makefile.in b/plugins/repo/Makefile.in
index 6adec10..8409705 100644
--- a/plugins/repo/Makefile.in
+++ b/plugins/repo/Makefile.in
@@ -20,16 +20,17 @@ ver = 0.7beta
 #   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 export rvs ?= @name@
-# Directories ######################################################
+# directories ######################################################
 srcdir ?= @srcdir@
 prefix ?= @prefix@
 exec_prefix ?= @exec_prefix@
 bindir ?= @bindir@
 sbindir ?= @sbindir@
 libexecdir ?= @libexecdir@
-#export srcdir prefix exec_prefix bindir sbindir libexecdir
+dirs = $(srcdir) $(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir)/
+#export   srcdir    prefix    exec_prefix    bindir    sbindir    libexecdir
 
-# Programs #########################################################
+# programs #########################################################
 RVS ?= @RVS@
 SHELL ?= @SHELL@
 RM ?= rm
@@ -56,7 +57,10 @@ srcFiles = $(filter-out %/Makefile.in,$(shell find $(mysrcdir)/ -type f))
 shSrcFiles = $(filter %.sh,$(srcFiles))
 shOutFiles = $(patsubst $(mysrcdir)/%,$(myoutdir)/%,$(basename $(shSrcFiles)))
 
-$(name) : $(shOutFiles)
+$(name) : $(myoutdir) $(shOutFiles) $(myoutdir)/plugin.conf
+
+$(myoutdir)/plugin.conf : $(mysrcdir)/plugin.conf
+	$(INSTALL_DATA) $< $@
 
 # (un)install ######################################################
 
@@ -90,13 +94,10 @@ $(d) : distclean
 
 b := @
 # build shell scripts
-$(myoutdir)/% : $(mysrcdir)/%.sh
-	$(MKDIR) $(dir $@)
-	$(INSTALL_PROGRAM) $< $@
-	$(SED) -i 's/$bSHELL@/$(subst /,\/,$(SHELL))/g' $@
-# workaround... idk why it doesn't match `lib/'
-$(myoutdir)/lib/% : $(mysrcdir)/lib/%.sh
-	$(MKDIR) $(dir $@)
+$(myoutdir)/% : $(mysrcdir)/%.sh $(myoutdir)
 	$(INSTALL_PROGRAM) $< $@
 	$(SED) -i 's/$bSHELL@/$(subst /,\/,$(SHELL))/g' $@
 
+$(dirs) $(libexecdir)/$(rvs) $(myoutdir) :
+	$(MKDIR) $@
+
diff --git a/plugins/repo/lib/stdio.sh b/plugins/repo/lib/stdio.sh
deleted file mode 100644
index c1a1b6b..0000000
--- a/plugins/repo/lib/stdio.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!@SHELL@
-#name='rvs repo stdio'
-#ver='0.7.3'
-#   Copyright (C) 2009 Luke Shumaker
-#   
-#   This file is part of rvs.
-#   
-#   rvs is free software; you can redistribute it and/or modify it under the
-#   terms of the GNU General Public License as published by the Free Software
-#   Foundation; either version 2, or (at your option) any later version.
-#   
-#   rvs is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#   See the GNU General Public License for more details.
-#   
-#   You should have received a copy of the GNU General Public License
-#   along with rvs; see the file COPYING.
-#   If not, write to the Free Software Foundation,
-#   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-verbose() {
-	if [ "$volume" == '-v' ]; then
-		echo $@ >> /dev/stderr
-	fi
-}
-
-out() {
-	if [ "$volume" != '-q' ]; then
-		echo $@ >> /dev/stderr
-	fi
-}
-
-warn () {
-	echo "$name: $1" >> /dev/stderr
-}
-
-fatal () {
-	warn "$1"
-	exit 1
-}
-
-error() {
-	warn "$1"
-	cat << __error__ >> /dev/stderr
-Usage: $name $usage
-
-Try \`$name --help\' for more options.
-__error__
-	exit 1
-}
-
-version() {
-	echo "$name $ver"
-	if [ "$volume" != '-q' ]; then
-		cat << __disclaimer__
-$name is copyright (C) 2009 Luke Shumaker
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-Originally written by Luke Shumaker <lukeshu@sbcglobal.net>.
-__disclaimer__
-	fi
-	exit 0
-}
-
diff --git a/plugins/users/Makefile.in b/plugins/users/Makefile.in
index b97720b..5de6cb3 100644
--- a/plugins/users/Makefile.in
+++ b/plugins/users/Makefile.in
@@ -20,16 +20,17 @@ ver = 0.7beta
 #   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 export rvs ?= @name@
-# Directories ######################################################
+# directories ######################################################
 srcdir ?= @srcdir@
 prefix ?= @prefix@
 exec_prefix ?= @exec_prefix@
 bindir ?= @bindir@
 sbindir ?= @sbindir@
 libexecdir ?= @libexecdir@
-#export srcdir prefix exec_prefix bindir sbindir libexecdir
+dirs = $(srcdir) $(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir)/
+#export   srcdir    prefix    exec_prefix    bindir    sbindir    libexecdir
 
-# Programs #########################################################
+# programs #########################################################
 RVS ?= @RVS@
 SHELL ?= @SHELL@
 RM ?= rm
@@ -44,10 +45,10 @@ TOUCH ?= touch # This file doesn't use touch
 
 # phony targets ####################################################
 all : $(name)
-.PHONY : $(name) install uninstall clean distclean
+.PHONY : $(name) install uninstall clean distclean dist
 .SUFFIXES :
 
-# main #############################################################
+# build ############################################################
 mysrcdir = $(srcdir)/plugins/$(name)
 myoutdir = out
 
@@ -56,7 +57,10 @@ srcFiles = $(filter-out %/Makefile.in,$(shell find $(mysrcdir)/ -type f))
 shSrcFiles = $(filter %.sh,$(srcFiles))
 shOutFiles = $(patsubst $(mysrcdir)/%,$(myoutdir)/%,$(basename $(shSrcFiles)))
 
-$(name) : $(shOutFiles)
+$(name) : $(myoutdir) $(shOutFiles) $(myoutdir)/plugin.conf
+
+$(myoutdir)/plugin.conf : $(mysrcdir)/plugin.conf
+	$(INSTALL_DATA) $< $@
 
 # (un)install ######################################################
 
@@ -90,13 +94,10 @@ $(d) : distclean
 
 b := @
 # build shell scripts
-$(myoutdir)/% : $(mysrcdir)/%.sh
-	$(MKDIR) $(dir $@)
-	$(INSTALL_PROGRAM) $< $@
-	$(SED) -i 's/$bSHELL@/$(subst /,\/,$(SHELL))/g' $@
-# workaround... idk why it doesn't match `lib/'
-$(myoutdir)/lib/% : $(mysrcdir)/lib/%.sh
-	$(MKDIR) $(dir $@)
+$(myoutdir)/% : $(mysrcdir)/%.sh $(myoutdir)
 	$(INSTALL_PROGRAM) $< $@
 	$(SED) -i 's/$bSHELL@/$(subst /,\/,$(SHELL))/g' $@
 
+$(dirs) $(libexecdir)/$(rvs) $(myoutdir) :
+	$(MKDIR) $@
+
diff --git a/plugins/users/lib/stdio.sh b/plugins/users/lib/stdio.sh
deleted file mode 100644
index 1149284..0000000
--- a/plugins/users/lib/stdio.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!@SHELL@
-#name='rvs users stdio'
-#ver='0.7.3'
-#   Copyright (C) 2009 Luke Shumaker
-#   
-#   This file is part of rvs.
-#   
-#   rvs is free software; you can redistribute it and/or modify it under the
-#   terms of the GNU General Public License as published by the Free Software
-#   Foundation; either version 2, or (at your option) any later version.
-#   
-#   rvs is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#   See the GNU General Public License for more details.
-#   
-#   You should have received a copy of the GNU General Public License
-#   along with rvs; see the file COPYING.
-#   If not, write to the Free Software Foundation,
-#   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-verbose() {
-	if [ "$volume" == '-v' ]; then
-		echo $@ >> /dev/stderr
-	fi
-}
-
-out() {
-	if [ "$volume" != '-q' ]; then
-		echo $@ >> /dev/stderr
-	fi
-}
-
-warn () {
-	echo "$name: $1" >> /dev/stderr
-}
-
-fatal () {
-	warn "$1"
-	exit 1
-}
-
-error() {
-	warn "$1"
-	cat << __error__ >> /dev/stderr
-Usage: $name $usage
-
-Try \`$name --help\' for more options.
-__error__
-	exit 1
-}
-
-version() {
-	echo "$name $ver"
-	if [ "$volume" != '-q' ]; then
-		cat << __disclaimer__
-$name is copyright (C) 2009 Luke Shumaker
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-Originally written by Luke Shumaker <lukeshu@sbcglobal.net>.
-__disclaimer__
-	fi
-	exit 0
-}
-