1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/examples/form-text+img/form/memo.def	Mon Aug 03 14:11:53 2015 +0900
     1.3 @@ -0,0 +1,4 @@
     1.4 +シリアル:ser:p:serial:
     1.5 +なまえ:name:s:text:maxlength="40"
     1.6 +ひとこと:memo:s:textarea:cols="40" rows="5"
     1.7 +添付ファイル:file:m:image:multiple

     2.1 --- a/s4-start.sh	Mon Aug 03 12:53:28 2015 +0900
     2.2 +++ b/s4-start.sh	Mon Aug 03 14:11:53 2015 +0900
     2.3 @@ -6,8 +6,8 @@
     2.4  
     2.5  script_dir=${SCRIPT_DIR:-scripts}
     2.6  
     2.7 -admin=""
     2.8 -type="form1"
     2.9 +ADMIN=""
    2.10 +TYPE="form1"
    2.11  ex=examples
    2.12  
    2.13  usage() {
    2.14 @@ -18,7 +18,7 @@
    2.15  	-h		Show this help
    2.16  	-a ADM		Set ADMIN email address to ADM
    2.17  	-f		Force overwriting
    2.18 -	-t TYPE		Force overwriting (defaults to $type)
    2.19 +	-t TYPE		Construction type (defaults to $TYPE)
    2.20  
    2.21  TYPEs are one of directory names in examples except \`common'.
    2.22  EOF
    2.23 @@ -26,24 +26,24 @@
    2.24  }
    2.25  while getopts a:fht: f; do
    2.26    case $f in
    2.27 -    a)	admin=$OPTARG;;
    2.28 +    a)	ADMIN=$OPTARG;;
    2.29      f)	force=1;;
    2.30 -    t)	type=$OPTARG;;
    2.31 +    t)	TYPE=$OPTARG;;
    2.32      \?|h)     usage; exit 1;;
    2.33    esac
    2.34  done
    2.35  shift $(expr $OPTIND - 1)
    2.36        
    2.37 -if [ ! -d $ex/$type ]; then
    2.38 +if [ ! -d $ex/$TYPE ]; then
    2.39    cat<<EOF 1>&2
    2.40 -Invalid type($type).
    2.41 +Invalid type($TYPE).
    2.42  Types are one of as follows.
    2.43  `ls $ex|grep -v common | sed 's/^/	/'`
    2.44  EOF
    2.45    exit 1
    2.46  fi
    2.47  
    2.48 -if [ -z "$admin" ]; then
    2.49 +if [ -z "$ADMIN" ]; then
    2.50    cat<<EOF 1>&2
    2.51  Administrator's email not specified.
    2.52  Please feed administrator email with \`-a' option.
    2.53 @@ -57,9 +57,9 @@
    2.54  fi
    2.55  
    2.56  . ./s4-funcs.sh || exit 2
    2.57 -if ! checkdomain $admin; then
    2.58 +if ! checkdomain $ADMIN; then
    2.59    cat<<EOF 1>&2
    2.60 -Administrator's email - $admin - is invalid(host not found).
    2.61 +Administrator's email - $ADMIN - is invalid(host not found).
    2.62  Please specify existing email address.
    2.63  EOF
    2.64    exit 3
    2.65 @@ -78,7 +78,7 @@
    2.66      cat<<EOF
    2.67  -------- The s4 System Successfully Installed --------
    2.68  EOF
    2.69 -    echo "ADMIN=$admin" >> s4-config.sh && rc=0
    2.70 +    echo "ADMIN=$ADMIN" >> s4-config.sh && rc=0
    2.71    else
    2.72      echo Calling s4-init.sh 'FAILED!!'
    2.73    fi