Browse Source

svn: 1556

Bryan Drewery 21 years ago
parent
commit
96e52f0a77
2 changed files with 6 additions and 3 deletions
  1. 4 2
      build
  2. 2 1
      misc/buildall

+ 4 - 2
build

@@ -53,9 +53,10 @@ nopkg=0
 bzip=0
 bzip=0
 pkg=0
 pkg=0
 scp=0
 scp=0
+nightly=0
 pack=pack/pack.cfg
 pack=pack/pack.cfg
 
 
-while getopts bCcdhnPp:s: opt ; do
+while getopts bCcdhnNPp:s: opt ; do
         case "$opt" in
         case "$opt" in
         b) bzip=1 ;;
         b) bzip=1 ;;
 	c) clean=1 ;;
 	c) clean=1 ;;
@@ -63,6 +64,7 @@ while getopts bCcdhnPp:s: opt ; do
         d) debug=1 ;;
         d) debug=1 ;;
 	h) usage; exit 0 ;;
 	h) usage; exit 0 ;;
         n) nopkg=1 ;;
         n) nopkg=1 ;;
+	N) nightly=1 ;;
 	p) pack="$OPTARG" ;;
 	p) pack="$OPTARG" ;;
         P) pkg=1 ;;
         P) pkg=1 ;;
 	s) scp="$OPTARG" ;;
 	s) scp="$OPTARG" ;;
@@ -134,7 +136,7 @@ then
   echo "[!] Automated packaging disabled, `uname` isn't recognized"
   echo "[!] Automated packaging disabled, `uname` isn't recognized"
 fi
 fi
 
 
-if ! [ $scp = "0" ]; then
+if [ $nightly = "1" ]; then
   chmod 0700 misc/id_dsa
   chmod 0700 misc/id_dsa
   remotedate="`ssh -q -i misc/id_dsa bryan@endurance.quadspeedi.net ls -al public_html/nightly/${os}-current.tar.gz | \
   remotedate="`ssh -q -i misc/id_dsa bryan@endurance.quadspeedi.net ls -al public_html/nightly/${os}-current.tar.gz | \
              sed -e 's/.*\-> \([0-1][0-2]\.[0-3][0-9]\.[0-9][0-9][0-9][0-9]\)\-.*/\1/'`"
              sed -e 's/.*\-> \([0-1][0-2]\.[0-3][0-9]\.[0-9][0-9][0-9][0-9]\)\-.*/\1/'`"

+ 2 - 1
misc/buildall

@@ -17,4 +17,5 @@ do
   ./build -n -P -p $cfg -s bryan@endurance.quadspeedi.net:public_html/builds/ all
   ./build -n -P -p $cfg -s bryan@endurance.quadspeedi.net:public_html/builds/ all
  fi
  fi
 done
 done
-ssh bryan@endurance.quadspeedi.net chmod 0644 public_html/builds/*.tar.gz
+chmod 0700 misc/id_dsa
+ssh -i misc/id_dsa bryan@endurance.quadspeedi.net chmod 0644 public_html/builds/*.tar.gz