Changeset 30398

Timestamp:

2016-03-09T20:48:26+13:00 (8 years ago)

Author:

ak19

Message:

Parallel changes for the linux machines to use variables in create-expeditee.sh in place of fixed strings. The variables should be set to concrete values in rke-setup.sh.

Location:

other-projects/expeditee-release-kits

Files:

• create-expeditee.sh (modified) (2 diffs)
• rke-setup.sh.in (modified) (1 diff)

other-projects/expeditee-release-kits/create-expeditee.sh

@@ -1 +1 @@
 #!/bin/bash
 
-currentdir=`pwd`
-# set currentdir to /home/sjm84 (when on /opt/lsb) on the linux VM machines
-# that produce nightlies
+
+# http://stackoverflow.com/questions/4774054/reliable-way-for-a-bash-script-to-get-the-full-path-to-itself
+currentdir=$( cd "$(dirname "$0")" ; pwd -P )
 
 if ! test -f "$currentdir/expeditee-release-kits/rke-setup.sh"; then
@@ -48 +48 @@
         # Uploading
         mkdir uploads
-        cp products/Expeditee-1-linux uploads/Expeditee-1-${DATE}-linux
-        cp rke.out uploads/Expeditee-${DATE}-linux.out
-        cd uploads && tar -c * | ssh -T -i "/root/.ssh/upload-expeditee-l32" [email protected]
+        cp products/Expeditee-1${products_suffix} uploads/Expeditee-1-${DATE}${uploads_suffix}
+        cp rke.out uploads/rke-${DATE}${out_suffix}.out
+        cd uploads && tar -c * | ssh -T -i "${identity_file}" [email protected]
 
         exit 0

other-projects/expeditee-release-kits/rke-setup.sh.in

@@ -2 +2 @@
 
 # $currentdir should have been set to the parent folder of expeditee-release-kits
+
+export os=
+export products_suffix=-${os}
+export uploads_suffix=${products_suffix}
+export out_suffix=-${os}
+# path to the private key
+export identity_file=
 
 # Need to use a JDK8!!!