Changeset 37917 for other-projects

Timestamp:

2023-08-10T18:00:25+12:00 (10 months ago)

Author:

anupama

Message:

Committing Kathy's local fixes to create-expeditee.sh, before committing my own on the Mac. I had mostly the same corrections: Paths should be releative to expeditee-release-kits, not expect a further subdir called expeditee-release-kits.

File:

• other-projects/expeditee-release-kits/trunk/create-expeditee.sh (modified) (4 diffs)

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

@@ -3 +3 @@
 
 # http://stackoverflow.com/questions/4774054/reliable-way-for-a-bash-script-to-get-the-full-path-to-itself
+#currentdir should be the path to expeditee-release-kits
 currentdir=$( cd "$(dirname "$0")" ; pwd -P )
 
-if ! test -f "$currentdir/expeditee-release-kits/rke-setup.sh"; then
+if ! test -f "$currentdir/rke-setup.sh"; then
     echo ""
     echo "********************"
-    echo "First edit $currentdir/expeditee-release-kits/rke-setup.sh.in"
-    echo "to generate $currentdir/expeditee-release-kits/rke-setup.sh"
+    echo "First edit $currentdir/rke-setup.sh.in"
+    echo "to generate $currentdir/rke-setup.sh"
     echo ""
     echo "********************"
@@ -17 +18 @@
     # rke-setup uses local paths, so cd into expeditee-release-kits first
     # then call rke-setup.sh to source the environment vars it sets
-    pushd "$currentdir/expeditee-release-kits"
+    pushd "$currentdir"
     source "rke-setup.sh"
     returnval=$?
@@ -38 +39 @@
         fi
         if ! test -f expeditee/rke-build.properties; then
-            cp $currentdir/expeditee-release-kits/rke-build.properties.in expeditee/rke-build.properties
+            cp $currentdir/rke-build.properties.in expeditee/rke-build.properties
         fi
         pushd expeditee
@@ -50 +51 @@
         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]
+
+        # the ssh inside the lsb cannot use ed25519 keys, so the uploading step is done outside lsb now
+        #cd uploads && tar -c * | ssh -T -i "${identity_file}" [email protected]
 
         exit 0