0.7.3 -- more robust copyright notices in files

16 files changed, 284 insertions, 139 deletions

diff --git a/plugins/repo/Makefile.in b/plugins/repo/Makefile.in
index 1e07226..fd84a25 100644
--- a/plugins/repo/Makefile.in
+++ b/plugins/repo/Makefile.in
@@ -1,14 +1,23 @@
 #!/usr/bin/make -f
 name = repo
 ver = 0.7beta
-# 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>.
-
+#   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.
 
 export rvs ?= @name@
 # Directories ######################################################
diff --git a/plugins/repo/commit.d.sh b/plugins/repo/commit.d.sh
index 1175a07..41715ea 100644
--- a/plugins/repo/commit.d.sh
+++ b/plugins/repo/commit.d.sh
@@ -1,13 +1,23 @@
 #!@SHELL@
 name='rvs repo commit.d'
-ver='0.7.2'
-# 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>.
+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.
 
 #source "$libexecdir/lib/stdio"
 
@@ -17,10 +27,10 @@ tmp=`tempfile`
 
 cd "$dir"
 for file in *; do
-	hash=`"$libexecdir/commit" "$file"`
+	hash=`"$RVS" commit "$file"`
 	echo "$file:$hash" >> "$tmp"
 done
 
-"$libexecdir/commit.f" "$tmp"
+"$RVS" commit.f "$tmp"
 rm "$tmp"
 
diff --git a/plugins/repo/commit.f.sh b/plugins/repo/commit.f.sh
index 15ba700..8a27e95 100644
--- a/plugins/repo/commit.f.sh
+++ b/plugins/repo/commit.f.sh
@@ -1,13 +1,23 @@
 #!@SHELL@
 name='rvs repo commit.f'
-ver='0.7.2'
-# 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>.
+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.
 
 #source "$libexecdir/lib/stdio"
 
diff --git a/plugins/repo/commit.sh b/plugins/repo/commit.sh
index d85dd01..f76324e 100644
--- a/plugins/repo/commit.sh
+++ b/plugins/repo/commit.sh
@@ -1,6 +1,6 @@
 #!@SHELL@
 name='rvs repo commit'
-ver='0.7.2'
+ver='0.7.3'
 # 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
@@ -14,8 +14,6 @@ source "$libexecdir/lib/stdio"
 # commit FILE
 file=${1-.}
 
-warn "$file"
-
 if [ ! -e $file ]; then error "file \`$file' does not exist";
 # START file type list
 elif [ -L $file ]; then type='l';	# symbolic link
@@ -30,7 +28,8 @@ elif [ -s $file ]; then type='s';	# socket
 else error "could not identify file type of \`$file'"
 fi
 
-ret=`"$libexecdir/commit.$type" "$file"`
+out "+$type `pwd`/$file"
+ret=`"$RVS" commit.$type "$file"`
 
 tmp=`tempfile`
 cat << __EOF__ > "$tmp"
@@ -42,6 +41,6 @@ owner:$owner
 license:$license
 __EOF__
 
-"$libexecdir/commit.f" "$tmp"
+"$RVS" commit.f "$tmp"
 rm "$tmp"
 
diff --git a/plugins/repo/get.d.sh b/plugins/repo/get.d.sh
index 834d8f5..46f8fd0 100644
--- a/plugins/repo/get.d.sh
+++ b/plugins/repo/get.d.sh
@@ -1,13 +1,23 @@
 #!@SHELL@
 name='rvs repo get.d'
-ver='0.7.2'
-# 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>.
+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.
 
 #source "$libexecdir/lib/stdio"
 
@@ -16,7 +26,7 @@ id="$1"
 dir="$2"
 
 tmp=`tempfile`
-"$libexecdir/get.f" "$id" "$tmp"
+"$RVS" get.f "$id" "$tmp"
 
 #install -d "$dir"
 mkdir -p "$dir"
@@ -30,7 +40,7 @@ while read line; do
 	# POSIX version
 		hash=`echo "$line" | sed 's/^.*://'`
 		name=`echo "$line" | sed "s/:$hash$//"`
-	"$libexecdir/get" "$hash" "$name"
+	"$RVS" get "$hash" "$name"
 done < "$tmp"
 
 rm "$tmp"
diff --git a/plugins/repo/get.f.sh b/plugins/repo/get.f.sh
index c37d77f..4862ccc 100644
--- a/plugins/repo/get.f.sh
+++ b/plugins/repo/get.f.sh
@@ -1,13 +1,23 @@
 #!@SHELL@
 name='rvs repo get.f'
-ver='0.7.2'
-# 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>.
+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.
 
 #source "$libexecdir/lib/stdio"
 
diff --git a/plugins/repo/get.sh b/plugins/repo/get.sh
index 52edc27..53894cf 100644
--- a/plugins/repo/get.sh
+++ b/plugins/repo/get.sh
@@ -1,26 +1,36 @@
 #!@SHELL@
 name='rvs repo get'
-ver='0.7.2'
-# 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>.
+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.
 
 source "$libexecdir/lib/stdio"
 
 # get ID [FILE]
 id="$1"
 tmp=`tempfile`
-"$libexecdir/get.f" "$id" "$tmp"
+"$RVS" get.f "$id" "$tmp"
 type="`sed     -n 's/^type://p' "$tmp"`"
 file="${2-`sed -n 's/^name://p' "$tmp"`}"
 hash="`sed     -n 's/^hash://p' "$tmp"`"
 
-out "-$type `pwd`/$file:$hash"
-"$libexecdir/get.$type" "$hash" "$file"
+out "-$type `pwd`/$file"
+"$RVS" get.$type "$hash" "$file"
 
 rm "$tmp"
 
diff --git a/plugins/repo/lib/stdio.sh b/plugins/repo/lib/stdio.sh
index 2975440..c1a1b6b 100644
--- a/plugins/repo/lib/stdio.sh
+++ b/plugins/repo/lib/stdio.sh
@@ -1,13 +1,23 @@
 #!@SHELL@
 #name='rvs repo stdio'
-#ver='0.7.2'
-# 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>.
+#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
@@ -23,7 +33,6 @@ out() {
 
 warn () {
 	echo "$name: $1" >> /dev/stderr
-	echo "$name: $1" >> "$repo/../rvs.log"
 }
 
 fatal () {
diff --git a/plugins/users/Makefile.in b/plugins/users/Makefile.in
index b6fe534..e6f3c24 100644
--- a/plugins/users/Makefile.in
+++ b/plugins/users/Makefile.in
@@ -1,14 +1,23 @@
 #!/usr/bin/make -f
 name = users
 ver = 0.7beta
-# 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>.
-
+#   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.
 
 export rvs ?= @name@
 # Directories ######################################################
diff --git a/plugins/users/commit.sh b/plugins/users/commit.sh
index f272013..ab30ea0 100644
--- a/plugins/users/commit.sh
+++ b/plugins/users/commit.sh
@@ -1,19 +1,29 @@
 #!@SHELL@
 name='rvs users commit'
-ver='0.7.2'
-# 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>.
+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.
 
 source "$libexecdir/lib/stdio"
 
 ret=`$RVS repo-0.7beta/commit $@`
-if [ -f "$REPO/user" ]; then
-	cp "$REPO/user" "$REPO/repo/$ret"
+if [ -f "$REPO/../user" ]; then
+	cp "$REPO/../user" "$REPO/repo/$ret"
 	echo "$ret"
 else
 	error 'you must be logged in to commit files'
diff --git a/plugins/users/init.sh b/plugins/users/init.sh
index cdb291c..b3347b9 100644
--- a/plugins/users/init.sh
+++ b/plugins/users/init.sh
@@ -1,13 +1,23 @@
 #!@SHELL@
 name='rvs users init'
-ver='0.7.2'
-# 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>.
+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.
 
 #source "$libexecdir/lib/stdio"
 
diff --git a/plugins/users/lib/stdio.sh b/plugins/users/lib/stdio.sh
index cad1b74..1149284 100644
--- a/plugins/users/lib/stdio.sh
+++ b/plugins/users/lib/stdio.sh
@@ -1,13 +1,23 @@
 #!@SHELL@
 #name='rvs users stdio'
-#ver='0.7.2'
-# 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>.
+#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
@@ -23,7 +33,6 @@ out() {
 
 warn () {
 	echo "$name: $1" >> /dev/stderr
-	echo "$name: $1" >> "$repo/../rvs.log"
 }
 
 fatal () {
diff --git a/plugins/users/login.sh b/plugins/users/login.sh
index 615f4c0..eee422a 100644
--- a/plugins/users/login.sh
+++ b/plugins/users/login.sh
@@ -1,19 +1,29 @@
 #!@SHELL@
 name='rvs users login'
-ver='0.7.2'
-# 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>.
+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.
 
 source "$libexecdir/lib/stdio"
 
 user="$1"
 if [ -f "$REPO/users/$user" ]; then
-	install -m 644 -T "$REPO/users/$user" "$REPO/user"
+	install -m 644 -T "$REPO/users/$user" "$REPO/../user"
 else
 	error "User \`$user' does not exist"
 fi
diff --git a/plugins/users/logout.sh b/plugins/users/logout.sh
index e3207a6..41d24a0 100644
--- a/plugins/users/logout.sh
+++ b/plugins/users/logout.sh
@@ -1,18 +1,28 @@
 #!@SHELL@
 name='rvs users logout'
-ver='0.7.2'
-# 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>.
+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.
 
 source "$libexecdir/lib/stdio"
 
-if [ -f "$REPO/user" ]; then
-	rm "$REPO/user"
+if [ -f "$REPO/../user" ]; then
+	rm "$REPO/../user"
 else
 	error 'you must be logged in to logout'
 fi
diff --git a/plugins/users/mkuser.sh b/plugins/users/mkuser.sh
index 6de768e..9296fef 100644
--- a/plugins/users/mkuser.sh
+++ b/plugins/users/mkuser.sh
@@ -1,13 +1,23 @@
 #!@SHELL@
 name='rvs users mkuser'
-ver='0.7.2'
-# 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>.
+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.
 
 source "$libexecdir/lib/stdio"
 
diff --git a/plugins/users/rmuser.sh b/plugins/users/rmuser.sh
index bad801e..7a33de8 100644
--- a/plugins/users/rmuser.sh
+++ b/plugins/users/rmuser.sh
@@ -1,13 +1,23 @@
 #!@SHELL@
 name='rvs users rmuser'
-ver='0.7.2'
-# 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>.
+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.
 
 source "$libexecdir/lib/stdio"