Changeset 240 for locker/deploy/bin

Timestamp:

Mar 20, 2007, 9:45:51 PM (17 years ago)

Author:

jbarnold

Message:

Another attempt to fix the automatic installer bug

Location:

locker/deploy/bin

Files:

• onathena (modified) (3 diffs)
• onserver.pm (modified) (1 diff)

locker/deploy/bin/onathena

@@ -30 +30 @@
 }
 
+#if [ "$override" = "" ]; then
 #echo "The scripts.mit.edu automatic installers are currently unavailable."
 #echo "We hope to make them available again soon."
 #echo "If you would like us to notify you as soon as they are available again,"
 #echo "let us know by sending us an e-mail at scripts@mit.edu"
-#exit
+#exit 
+#fi
 
 echo 
@@ -164 +166 @@
 fi
 
-if [ "$prompt_password" -eq 1 ]; then
-    stty -echo
-    sshrun "deploy$scriptdev/bin/prompt-password '$sname' '$deploy' '$addrend' '$admin_username'"
-    stty echo
-fi
-
-echo
-echo "Unpacking $sname... (this step might take several minutes)"
-
-if [ "$create_dir" = "" ]; then
-  create_dir=0
-fi
-
-if [ "$create_dir" -eq 1 ]; then
-  mkdir -p "$lroot/scripts-$deploy"
-  fs sa "$lroot/scripts-$deploy" system:anyuser none
-  fs sa "$lroot/scripts-$deploy" system:authuser none
-  fs sa "$lroot/scripts-$deploy" daemon.scripts write
-  fs sa "$lroot/scripts-$deploy" system:scripts-security-upd write
-fi
-
 origdir=`pwd`
 mkdir -p "$lroot/web_scripts_tmp"
@@ -198 +179 @@
 fs sa . daemon.scripts write
 fs sa . system:scripts-security-upd write
+
+if [ "$prompt_password" -eq 1 ]; then
+    stty -echo
+    sshrun "deploy$scriptsdev/bin/prompt-password '$sname' '$deploy' '$addrend' '$admin_username'"
+    stty echo
+fi
+
+echo
+echo "Unpacking $sname... (this step might take several minutes)"
+
+if [ "$create_dir" = "" ]; then
+  create_dir=0
+fi
+
+if [ "$create_dir" -eq 1 ]; then
+  mkdir -p "$lroot/scripts-$deploy"
+  fs sa "$lroot/scripts-$deploy" system:anyuser none
+  fs sa "$lroot/scripts-$deploy" system:authuser none
+  fs sa "$lroot/scripts-$deploy" daemon.scripts write
+  fs sa "$lroot/scripts-$deploy" system:scripts-security-upd write
+fi
+
 athrun scripts gtar zxf "/mit/scripts/deploy$scriptsdev/$deploy.tar.gz"
-files=`athrun scripts gfind . -mindepth 1 -maxdepth 1`
+files=`athrun scripts gfind . -mindepth 1 -maxdepth 1 | grep -v .admin`
 numfiles=`echo "$files" | wc -l`
 if [ "$numfiles" -eq 1 ]; then

locker/deploy/bin/onserver.pm

@@ -65 +65 @@
   if(-e "$HOME/web_scripts/$addrend/.admin") { 
     $admin_password=`cat $HOME/web_scripts/$addrend/.admin`;
-  }
-  chomp($admin_password);
-  unlink "$HOME/web_scripts/$addrend/.admin";
-  
+    chomp($admin_password);
+    unlink "$HOME/web_scripts/$addrend/.admin";
+  } 
+
   print "\nConfiguring $sname...\n";