Changeset 1494 for branches/locker-dev

Timestamp:

Feb 26, 2010, 1:15:32 AM (15 years ago)

Author:

broder

Message:

Distinguish between scripts for scripts and scripts for autoinstallers.

Some pieces of the autoinstaller process are clearly tied to scripts
itself - e.g. scripts to get information from sql.mit.edu. Others are
clearly tied to the autoinstaller - e.g. the
/mit/scripts/deploy/bin/foo scripts.

Out-of-tree autoinstallers want to replace the latter, but not the
former.

For scripts that fall into the former category, explicitly call them
from /mit/scripts. For those that fall into the latter, call them from
/mit/$ailocker. New out-of-tree autoinstallers can define ailocker to
provide their own hooks.

File:

• branches/locker-dev/locker/deploy/bin/onathena (modified) (7 diffs)

branches/locker-dev/locker/deploy/bin/onathena

@@ -3 +3 @@
 : ${aicontact:=scripts@mit.edu}
 : ${aimaintainer:=scripts.mit.edu}
+: ${ailocker=scripts}
 
 
@@ -21 +22 @@
 
 attach scripts
+attach "$ailocker"
 
 sshrun() {
-  /afs/athena.mit.edu/contrib/scripts/bin$scriptsdev/scripts-ssh "$lname" "/mit/scripts/$@" 2>/dev/null
+  /afs/athena.mit.edu/contrib/scripts/bin$scriptsdev/scripts-ssh "$lname" "$@" 2>/dev/null
 }
 
 vsshrun() {
-  /afs/athena.mit.edu/contrib/scripts/bin$scriptsdev/scripts-ssh "$lname" "/mit/scripts/$@"
+  /afs/athena.mit.edu/contrib/scripts/bin$scriptsdev/scripts-ssh "$lname" "$@"
 }
 
 checksqlpass() {
-    errors=`sshrun "sql/bin$scriptsdev/test-password"`
+    errors=`sshrun "/mit/scripts/sql/bin$scriptsdev/test-password"`
     if [ "$errors" != "" ]; then
         if [ "$1" -eq 1 ]; then
@@ -141 +143 @@
 
 if [ "$requires_sql" -eq 1 ]; then
-  sqlinfo=`sshrun "sql/bin$scriptsdev/get-password"`
+  sqlinfo=`sshrun "/mit/scripts/sql/bin$scriptsdev/get-password"`
   if [ "$sqlinfo" = "" ]; then
       echo 
@@ -207 +209 @@
 
 if [ "$wizard" != "" ]; then
-  vsshrun "wizard/bin/wizard" "install" "$@" "$wizard" "$lroot/web_scripts/$addrend"
+  vsshrun "/mit/$ailocker/wizard/bin/wizard" "install" "$@" "$wizard" "$lroot/web_scripts/$addrend"
   exit 0
 fi
@@ -238 +240 @@
 if [ "$prompt_password" -eq 1 ]; then
     stty -echo
-    sshrun "deploy$scriptsdev/bin/prompt-password" "$sname" "$deploy" "$addrend" "$admin_username"
+    sshrun "/mit/$ailocker/deploy$scriptsdev/bin/prompt-password" "$sname" "$deploy" "$addrend" "$admin_username"
     stty echo
 fi
@@ -245 +247 @@
 echo "Unpacking $sname... (this step might take several minutes)"
 # xavid: use p to keep the same permissions as in the file
-athrun scripts gtar zxpf "/mit/scripts/deploy$scriptsdev/$deploy.tar.gz"
+athrun scripts gtar zxpf "/mit/$ailocker/deploy$scriptsdev/$deploy.tar.gz"
 files=`athrun scripts gfind . -mindepth 1 -maxdepth 1 | grep -v .admin`
 numfiles=`echo "$files" | wc -l`
@@ -254 +256 @@
     fi
 fi
-if [ -f "/mit/scripts/deploy$scriptsdev/php.ini/$deploy" ]; then
+if [ -f "/mit/$ailocker/deploy$scriptsdev/php.ini/$deploy" ]; then
         nodot=`echo "$lname" | sed "/\./s///"`;
-        sed -e "/SCRIPTS_USER/ s//$lname/" -e "/SCRIPTS_NODOT/ s//$nodot/" "/mit/scripts/deploy$scriptsdev/php.ini/$deploy" > php.ini
+        sed -e "/SCRIPTS_USER/ s//$lname/" -e "/SCRIPTS_NODOT/ s//$nodot/" "/mit/$ailocker/deploy$scriptsdev/php.ini/$deploy" > php.ini
         athrun scripts gfind . -mindepth 1 -type d -exec sh -c 'ln -sf "`echo "$1" | sed '\''s,[^/],,g; s,/,../,g'\''`php.ini" "$1/"' -- {} \;
 fi
 cd "$origdir"
 
-vsshrun "deploy$scriptsdev/bin/$deploy" "$sname" "$deploy" "$addrend" "$admin_username" "$requires_sql" "$scriptsdev" "$USER" || die "Unknown failure during configuration"
+vsshrun "/mit/$ailocker/deploy$scriptsdev/bin/$deploy" "$sname" "$deploy" "$addrend" "$admin_username" "$requires_sql" "$scriptsdev" "$USER" || die "Unknown failure during configuration"
 rm -f "$lroot/web_scripts/$addrend/.scripts-tmp"
 checkfailed