Ignore:
Timestamp:
Jun 11, 2011, 11:21:38 PM (11 years ago)
Author:
adehnert
Message:
Merge locker-dev to trunk
Location:
trunk/locker
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/locker

  • trunk/locker/deploy/bin

  • trunk/locker/deploy/bin/onathena

    r1693 r1901  
    6262echo
    6363echo "Please report problems with this installer to $aicontact."
    64 echo
    65 echo "Are you performing this install for:"
    66 echo "1. Your personal Athena account"
    67 echo "2. A locker that you control (a club, a course, etc)"
    68 echo "If you do not understand this question, you should answer '1'."
    69 printf "Please enter either '1' or '2' (without quotes): "
    70 read whofor
    71 if [ "$whofor" = 1 ]; then
    72     lname="${ATHENA_USER:-$USER}"
    73 elif [ "$whofor" = 2 ]; then
    74     echo
    75     echo "OK.  $sname will be installed into a locker of your choice that"
    76     echo "you control.  Please enter the name of the selected locker below."
    77     echo "(For the locker /mit/lsc -- which has a full path of"
    78     echo "/afs/athena.mit.edu/activity/l/lsc -- you would simply enter lsc)."
    79     printf "Locker name: "
    80     read lname
     64
     65if [ -n "$SCRIPTS_INSTALL_LOCKER" ]; then
     66    lname=$SCRIPTS_INSTALL_LOCKER
    8167else
    8268    echo
    83     echo "ERROR:"
    84     echo "You must select either '1' or '2'."
    85     exit 1
    86 fi
    87 while true; do
    88     if attach "$lname"; then
    89         break
    90     fi
    91     echo "$lname is not a valid locker name."
    92     printf "Locker name: "
    93     read lname
    94 done
     69    echo "Are you performing this install for:"
     70    echo "1. Your personal Athena account"
     71    echo "2. A locker that you control (a club, a course, etc)"
     72    echo "If you do not understand this question, you should answer '1'."
     73    printf "Please enter either '1' or '2' (without quotes): "
     74    read whofor
     75    if [ "$whofor" = 1 ]; then
     76        lname="${ATHENA_USER:-$USER}"
     77    elif [ "$whofor" = 2 ]; then
     78        echo
     79        echo "OK.  $sname will be installed into a locker of your choice that"
     80        echo "you control.  Please enter the name of the selected locker below."
     81        echo "(For the locker /mit/lsc -- which has a full path of"
     82        echo "/afs/athena.mit.edu/activity/l/lsc -- you would simply enter lsc)."
     83        printf "Locker name: "
     84        read lname
     85    else
     86        echo
     87        echo "ERROR:"
     88        echo "You must select either '1' or '2'."
     89        exit 1
     90    fi
     91    while true; do
     92        if attach "$lname"; then
     93            break
     94        fi
     95        echo "$lname is not a valid locker name."
     96        printf "Locker name: "
     97        read lname
     98    done
     99    unset whofor
     100fi
    95101lroot="/mit/$lname"
    96102
     
    101107. "/mit/scripts/bin$scriptsdev/signup-web"
    102108
    103 echo
    104 echo "Your new copy of $sname will appear on the web at a URL"
    105 echo "that starts with http://$lname.scripts.mit.edu/"
    106 echo "Please decide upon a complete URL and enter it below."
    107 echo "You must enter one or more characters after mit.edu/"
    108 echo "The completed address must only contain a-z, 0-9, and /."
    109 printf "Desired address: http://$lname.scripts.mit.edu/"
    110 read addrend
     109if [ -n "$SCRIPTS_INSTALL_ADDREND" ]; then
     110    addrend=$SCRIPTS_INSTALL_ADDREND
     111else
     112    echo
     113    echo "Your new copy of $sname will appear on the web at a URL"
     114    echo "that starts with http://$lname.scripts.mit.edu/"
     115    echo "Please decide upon a complete URL and enter it below."
     116    echo "You must enter one or more characters after mit.edu/"
     117    echo "The completed address must only contain a-z, 0-9, and /."
     118    printf "Desired address: http://$lname.scripts.mit.edu/"
     119    read addrend
     120fi
    111121
    112122addrend=`perl -0e 'print $ARGV[0] =~ /^([\w\/-]*[\w-])\/*$/' -- "$addrend"`
     
    209219
    210220if [ "$wizard" != "" ]; then
    211   vsshrun "/mit/$ailocker/wizard/bin/wizard" "install" "$@" "$wizard" "$lroot/web_scripts/$addrend"
     221  if [ "$create_scripts_dir" -eq 1 ]; then
     222    vsshrun "/mit/$ailocker/wizard/bin/wizard" "install" "--web-stub-path" "$lroot/web_scripts/$addrend" "$@" "$wizard" "$lroot/Scripts/$deploy/$addrend"
     223  else
     224    vsshrun "/mit/$ailocker/wizard/bin/wizard" "install" "$@" "$wizard" "$lroot/web_scripts/$addrend"
     225  fi
    212226  exit 0
    213227fi
Note: See TracChangeset for help on using the changeset viewer.