Ignore:
Timestamp:
Jan 13, 2010, 1:09:31 AM (14 years ago)
Author:
ezyang
Message:
Fix broken autoinstalls due to lack of tarball.

Merging r1417 through r1420 into 'deploy/bin/onathena':
U    deploy/bin/onathena

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/locker/deploy/bin/onathena

    r1417 r1421  
    238238fi
    239239
     240echo
     241echo "Unpacking $sname... (this step might take several minutes)"
     242# xavid: use p to keep the same permissions as in the file
     243athrun scripts gtar zxpf "/mit/scripts/deploy$scriptsdev/$deploy.tar.gz"
     244files=`athrun scripts gfind . -mindepth 1 -maxdepth 1 | grep -v .admin`
     245numfiles=`echo "$files" | wc -l`
     246if [ ! -z "$files" ]; then
     247    if [ "$numfiles" -eq 1 ]; then
     248        athrun scripts gfind . -mindepth 2 -maxdepth 2 | xargs -i mv \{} .
     249        rmdir "$files"
     250    fi
     251fi
     252if [ -f "/mit/scripts/deploy$scriptsdev/php.ini/$deploy" ]; then
     253        nodot=`echo "$lname" | sed "/\./s///"`;
     254        sed -e "/SCRIPTS_USER/ s//$lname/" -e "/SCRIPTS_NODOT/ s//$nodot/" "/mit/scripts/deploy$scriptsdev/php.ini/$deploy" > php.ini
     255        athrun scripts gfind . -mindepth 1 -type d -exec sh -c 'ln -sf "`echo "$1" | sed '\''s,[^/],,g; s,/,../,g'\''`php.ini" "$1/"' -- {} \;
     256fi
    240257cd "$origdir"
    241258
    242 echo
    243 echo "Unpacking $sname... (this step might take several minutes)"
    244 
    245 vsshrun "deploy$scriptsdev/bin/$deploy" "$lname" "$sname" "$deploy" "$addrend" "$admin_username" "$requires_sql" "$scriptsdev" "$USER" || die "Unknown failure during configuration"
     259vsshrun "deploy$scriptsdev/bin/$deploy" "$sname" "$deploy" "$addrend" "$admin_username" "$requires_sql" "$scriptsdev" "$USER" || die "Unknown failure during configuration"
    246260rm -f "$lroot/web_scripts/$addrend/.scripts-tmp"
    247261checkfailed
Note: See TracChangeset for help on using the changeset viewer.