10 files changed, 137 insertions, 144 deletions
diff --git a/plugins/users/commit.sh b/plugins/users/commit.sh
index cb2488d..1fa2e52 100644
--- a/plugins/users/commit.sh
+++ b/plugins/users/commit.sh
@@ -1,23 +1,21 @@
-#!@SHELL@
+#!/bin/sh
 name='rvs users commit'
-ver=0.8r61
-#   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.
+ver=0.9
+#  Copyright (C) 2009 Luke Shumaker
+#  
+#  This program 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 of the
+#  License, or (at your option) any later version.
+#  
+#  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.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program;  see the file COPYING.
+#  If not, see <http://www.gnu.org/licenses>.
 
 source "$libexecdir/@ID@/stdio"
 
diff --git a/plugins/users/init.sh b/plugins/users/init.sh
index 41f7d77..142f54c 100644
--- a/plugins/users/init.sh
+++ b/plugins/users/init.sh
@@ -1,23 +1,21 @@
-#!@SHELL@
+#!/bin/sh
 name='rvs users init'
-ver=0.8r61
-#   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.
+ver=0.9
+#  Copyright (C) 2009 Luke Shumaker
+#  
+#  This program 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 of the
+#  License, or (at your option) any later version.
+#  
+#  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.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program;  see the file COPYING.
+#  If not, see <http://www.gnu.org/licenses>.
 
 #source "$libexecdir/@ID@/stdio"
 
diff --git a/plugins/users/login.sh b/plugins/users/login.sh
index 340c7db..40a5830 100644
--- a/plugins/users/login.sh
+++ b/plugins/users/login.sh
@@ -1,23 +1,21 @@
-#!@SHELL@
+#!/bin/sh
 name='rvs users login'
-ver=0.8r61
-#   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.
+ver=0.9
+#  Copyright (C) 2009 Luke Shumaker
+#  
+#  This program 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 of the
+#  License, or (at your option) any later version.
+#  
+#  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.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program;  see the file COPYING.
+#  If not, see <http://www.gnu.org/licenses>.
 
 source "$libexecdir/@ID@/stdio"
 
diff --git a/plugins/users/logout.sh b/plugins/users/logout.sh
index 43011a1..260846e 100644
--- a/plugins/users/logout.sh
+++ b/plugins/users/logout.sh
@@ -1,23 +1,21 @@
-#!@SHELL@
+#!/bin/sh
 name='rvs users logout'
-ver=0.8r61
-#   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.
+ver=0.9
+#  Copyright (C) 2009 Luke Shumaker
+#  
+#  This program 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 of the
+#  License, or (at your option) any later version.
+#  
+#  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.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program;  see the file COPYING.
+#  If not, see <http://www.gnu.org/licenses>.
 
 source "$libexecdir/@ID@/stdio"
 
diff --git a/plugins/users/main.mk.in b/plugins/users/main.mk.in
index 71cc305..1a04b33 100644
--- a/plugins/users/main.mk.in
+++ b/plugins/users/main.mk.in
@@ -1,25 +1,24 @@
 #!/usr/bin/make -f
-name=users
-ver=0.8r61
-#   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.
+name=filedata
+ver=0.9
+#  Copyright (C) 2009 Luke Shumaker
+#  
+#  This program 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 of the
+#  License, or (at your option) any later version.
+#  
+#  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.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program;  see the file COPYING.
+#  If not, see <http://www.gnu.org/licenses>.
 
 rvs = @name@
+id = $(name)-$(ver)
 
 # phony targets ####################################################
 all : $(name)
@@ -68,6 +67,12 @@ $(myoutdir)/% : $(mysrcdir)/%.sh $(myoutdir)
 	-e 's/$bID@/$(subst /,\/,$(id))/g' \
 	 $@
 
-$(libexecdir)/$(rvs) $(myoutdir) :
+plugin.conf : plugin.conf.in
+	$(SED) \
+	-e 's/$bname@/$(subst /,\/,$(name))/g' \
+	-e 's/$bver@/$(subst /,\/,$(ver))/g' \
+	 $< > $@
+
+$(DESTDIR)$(libexecdir)/$(rvs) $(myoutdir) :
 	$(MKDIR) $@
 
diff --git a/plugins/users/mkuser.sh b/plugins/users/mkuser.sh
index 68c16b2..6f72ea9 100644
--- a/plugins/users/mkuser.sh
+++ b/plugins/users/mkuser.sh
@@ -1,6 +1,6 @@
-#!@SHELL@
+#!/bin/sh
 name='rvs users mkuser'
-ver=0.8r61
+ver=0.9
 #   Copyright (C) 2009 Luke Shumaker
 #   
 #   This file is part of rvs.
diff --git a/plugins/users/plugin.conf b/plugins/users/plugin.conf
deleted file mode 100644
index 1224b23..0000000
--- a/plugins/users/plugin.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# rvs users plugins.conf
-# ver=0.8r61
-commit:repo-0.8r61/commit
-login
-logout
-mkuser
-rmuser
diff --git a/plugins/users/plugin.conf.in b/plugins/users/plugin.conf.in
new file mode 100644
index 0000000..9b1b35c
--- /dev/null
+++ b/plugins/users/plugin.conf.in
@@ -0,0 +1,7 @@
+# rvs @name@ plugins.conf
+# ver=@ver@
+commit:repo-0.9/commit
+login
+logout
+mkuser
+rmuser
diff --git a/plugins/users/rmuser.sh b/plugins/users/rmuser.sh
index a9f566f..604f359 100644
--- a/plugins/users/rmuser.sh
+++ b/plugins/users/rmuser.sh
@@ -1,23 +1,21 @@
-#!@SHELL@
+#!/bin/sh
 name='rvs users rmuser'
-ver=0.8r61
-#   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.
+ver=0.9
+#  Copyright (C) 2009 Luke Shumaker
+#  
+#  This program 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 of the
+#  License, or (at your option) any later version.
+#  
+#  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.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program;  see the file COPYING.
+#  If not, see <http://www.gnu.org/licenses>.
 
 source "$libexecdir/@ID@/stdio"
 
diff --git a/plugins/users/stdio.sh b/plugins/users/stdio.sh
index a8bd155..edf7c01 100644
--- a/plugins/users/stdio.sh
+++ b/plugins/users/stdio.sh
@@ -1,23 +1,21 @@
-#!@SHELL@
+#!/bin/sh
 #name='rvs users stdio'
-#ver=0.8r61
-#   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.
+#ver=0.9
+#  Copyright (C) 2009 Luke Shumaker
+#  
+#  This program 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 of the
+#  License, or (at your option) any later version.
+#  
+#  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.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program;  see the file COPYING.
+#  If not, see <http://www.gnu.org/licenses>.
 
 verbose() {
 	if [ "$volume" == '-v' ]; then
@@ -27,7 +25,7 @@ verbose() {
 
 out() {
 	if [ "$volume" != '-q' ]; then
-		echo $@ >> /dev/stderr
+		echo $@
 	fi
 }