[Bobs-cvs] CVS: bobs ChangeLog,1.9,1.10 INSTALL,1.22,1.23 Makefile.am,1.14,1.15 Makefile.in,1.12,1.13 TODO,1.16,1.17

[Joe Z. <jz...@us...>]

Update of /cvsroot/bobs/bobs
In directory sc8-pr-cvs1:/tmp/cvs-serv11810/bobs

Modified Files:
	ChangeLog INSTALL Makefile.am Makefile.in TODO 
Log Message:
'make uninstall-all' checks that no mount points are active in /var/bobsdata.
'make uninstall' kills the cmdloop script.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/bobs/bobs/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ChangeLog	4 May 2003 19:51:59 -0000	1.9
+++ ChangeLog	9 May 2003 05:39:53 -0000	1.10
@@ -15,6 +15,13 @@
 	-- 4-26-2003
 	   Create a "Check Configuration" option on the admin page.
            Admins need to be able to test if a setup works.
+    -- 5-07-2003
+       	Allow changing admin password in browser interface.
+    -- Bug fix 5-08-2003
+       'make uninstall-all' checks that nothing is mounted in 
+       bobs data directory (/var/bobsdata). I fixed this bug after
+       deleting 3 years of my kid's homework.
+       'make uninstall' also kills the cmdloop script.
 
 Version 0.6.0pre1
 	Rene Rask (re...@gr...)

Index: INSTALL
===================================================================
RCS file: /cvsroot/bobs/bobs/INSTALL,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- INSTALL	8 May 2003 05:46:50 -0000	1.22
+++ INSTALL	9 May 2003 05:39:53 -0000	1.23
@@ -373,7 +373,3 @@
 remove all the files and directories, including any backups. So only
 run 'make uninstall-all' if you want to completely remove bobs and all
 configurations and backups created by bobs.
-
-CAUTION: If any "bobs" backup directories are mounted (they're in
-/var/bobsdata), 'make uninstall-all' will delete the mounted directory! I
-think I deleted all my kid's homework by accident that way.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/bobs/bobs/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile.am	8 May 2003 05:46:51 -0000	1.14
+++ Makefile.am	9 May 2003 05:39:53 -0000	1.15
@@ -105,6 +105,7 @@
 # The '-' on '-rmdir' tells 'make' to ignore any error returned by command
 #
 uninstall-local:
+	-kill `/sbin/pidof -x cmdloop`
 	-rmdir `find $(myWEBDIR) -type d | sort -r`
 	-rmdir $(myBOBSDATA)/current/process/{cmd,mounts,session}
 	-rmdir $(myBOBSDATA)/current/process
@@ -114,10 +115,19 @@
 #
 # This will remove all the install directories - empty or not.
 #
-uninstall-all:
-	rm -rf $(myWEBDIR)
-	rm -rf $(myBOBSDATA)
-	make -f cron/Makefile uninstall-local
+uninstall-all: uninstall
+
+# Be sure no bobs mount points are active!
+# That's how I deleted 3 years worth of my kid's homework!
+
+	if [ `mount | grep -c $(myBOBSDATA)` -eq 0 ]; then \
+		rm -rf $(myWEBDIR); \
+		rm -rf $(myBOBSDATA); \
+		make -f cron/Makefile uninstall-local; \
+	else \
+		echo "Error *** Can't uninstall-all right now. Some mount points are active in $(myBOBSDATA)"; \
+		exit 1; \
+	fi
 
 rpm: dist
 

Index: Makefile.in
===================================================================
RCS file: /cvsroot/bobs/bobs/Makefile.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile.in	8 May 2003 05:46:51 -0000	1.12
+++ Makefile.in	9 May 2003 05:39:53 -0000	1.13
@@ -526,6 +526,7 @@
 # The '-' on '-rmdir' tells 'make' to ignore any error returned by command
 #
 uninstall-local:
+	-kill `/sbin/pidof -x cmdloop`
 	-rmdir `find $(myWEBDIR) -type d | sort -r`
 	-rmdir $(myBOBSDATA)/current/process/{cmd,mounts,session}
 	-rmdir $(myBOBSDATA)/current/process
@@ -535,10 +536,19 @@
 #
 # This will remove all the install directories - empty or not.
 #
-uninstall-all:
-	rm -rf $(myWEBDIR)
-	rm -rf $(myBOBSDATA)
-	make -f cron/Makefile uninstall-local
+uninstall-all: uninstall
+
+# Be sure no bobs mount points are active!
+# That's how I deleted 3 years worth of my kid's homework!
+
+	if [ `mount | grep -c $(myBOBSDATA)` -eq 0 ]; then \
+		rm -rf $(myWEBDIR); \
+		rm -rf $(myBOBSDATA); \
+		make -f cron/Makefile uninstall-local; \
+	else \
+		echo "Error *** Can't uninstall-all right now. Some mount points are active in $(myBOBSDATA)"; \
+		exit 1; \
+	fi
 
 rpm: dist
 	mkdir -p \

Index: TODO
===================================================================
RCS file: /cvsroot/bobs/bobs/TODO,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- TODO	1 May 2003 05:21:14 -0000	1.16
+++ TODO	9 May 2003 05:39:53 -0000	1.17
@@ -30,7 +30,6 @@
 	Priority: Medium
 	Backup directories (/var/bobsdata/) should not be world readable.
 	Encrypt passwords.
-	Allow changing admin password in browser interface.
 
 User and group administration
 	Priority: Medium