From: W. Trevor King <wking@drexel.edu>
Date: Wed, 26 Nov 2008 19:26:55 +0000 (-0500)
Subject: Reworked original crummy disconnect script
X-Git-Tag: v0.3~95
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f29ff28821a811954e4d4f0267a8dc3312c282d7;p=dotfiles-framework.git

Reworked original crummy disconnect script
---

diff --git a/disconnect.sh b/disconnect.sh
index d92089c..be436fa 100755
--- a/disconnect.sh
+++ b/disconnect.sh
@@ -6,6 +6,13 @@
 # normal.  Note that this will delete your ~/.dotfiles directory, and
 # strip the .dotfiles portion from your ~/.bashrc file.
 
+# See if the bashrc file is involved with .dotfiles at all
+if [ -e _bashrc ]; then
+    BASHRC="yes"
+else
+    BASHRC="no"
+fi
+
 # For each file in this directory.
 for file in _*; do
     # Create .dotfile version.
@@ -19,25 +26,22 @@ for file in _*; do
     fi
 done
 
-# See if the bashrc file is involved with .dotfiles at all
-if [ ! -e _bashrc ]; then
-    # No _bashrc file, so leave ~/.bashrc alone
-    exit
+if [ $BASH_RC == "yes" ]; then
+    # We may have a dotfiles section in ~/.bashrc.  Strip it out.
+    BC="### ---- begin .dotfiles section ---- (keep this magic comment)"
+    EC="### ---- end .dotfiles section ---- (keep this magic comment)"
+    AWKSCRIPT="BEGIN{copy=1}{"
+    AWKSCRIPT="$AWKSCRIPT if(\$0 == \"$BC\"){copy=0};"
+    AWKSCRIPT="$AWKSCRIPT if(\$0 == \"$EC\"){copy=1};"
+    AWKSCRIPT="$AWKSCRIPT if(copy==1 && \$0 != \"$EC\"){print \$0}"
+    AWKSCRIPT="$AWKSCRIPT}"
+    
+    awk "$AWKSCRIPT" ~/.bashrc > bashrc_stripped
+    
+    # see if the stripped file is any different
+    DIFF=`diff ~/.bashrc bashrc_stripped` || exit 1
+    if [ -n "$DIFF" ]; then
+	rm -f ~/.bashrc
+	cp bashrc_stripped ~/.bashrc
+    fi
 fi
-
-# We may have a dotfiles section in ~/.bashrc.  Strip it out.
-BC="### ---- begin .dotfiles section ---- (keep this magic comment)"
-EC="### ---- end .dotfiles section ---- (keep this magic comment)"
-AWKSCRIPT="BEGIN{copy=1}{"
-AWKSCRIPT="$AWKSCRIPT if(\$0 == \"$BC\"){copy=0};"
-AWKSCRIPT="$AWKSCRIPT if(\$0 == \"$EC\"){copy=1};"
-AWKSCRIPT="$AWKSCRIPT if(copy==1 && \$0 != \"$EC\"){print \$0}"
-AWKSCRIPT="$AWKSCRIPT}"
-
-awk "$AWKSCRIPT" ~/.bashrc > bashrc_stripped
-# see if the stripped file is any different
-DIFF=`diff ~/.bashrc bashrc_stripped` || exit 1
-if [ -n "$DIFF" ]
-
-rm -f ~/.bashrc
-cp bashrc_stripped ~/.bashrc