From: clinton_admin <clinton_admin@navajos.hcoop.net>
Date: Thu, 20 Dec 2012 08:30:22 +0000 (-0500)
Subject: Fix restoring shell on unfreeze when member did not have a shell preference
X-Git-Url: https://git.hcoop.net/hcoop/scripts.git/commitdiff_plain/aeae890598eec0930f58833f9f2684788560c2cf

Fix restoring shell on unfreeze when member did not have a shell preference
---

diff --git a/freeze b/freeze
index 5c497a5..6883a58 100755
--- a/freeze
+++ b/freeze
@@ -238,14 +238,15 @@ sub login {
 	}
 
 	elsif ($a =~ /^u/i) {
+	    if ( -l "$user[5]/.loginshell" or -e "$user[5]/.loginshell" ) {
+		if (!DRY) {
+		    system("rm '$user[5]/.loginshell'");
+		} else {
+		    warn qq{system("rm '$user[5]/.loginshell'")\n};
+		}
+	    }
+
 		if ( $$store{$u}{shell}) {
-			if ( -l "$user[5]/.loginshell" or -e "$user[5]/.loginshell" ) {
-				if (!DRY) {
-					system("rm '$user[5]/.loginshell'");
-				} else {
-					warn qq{system("rm '$user[5]/.loginshell'")\n};
-				}
-			}
 			if (!DRY) {
 				symlink($$store{$u}{shell}, "$user[5]/.loginshell")
 					or warn "symlink: $!";