Changeset 80458

Timestamp:

07/13/11 07:21:10 (4 years ago)

Author:

wsiegrist@…

Message:

Partial work to run on the master instead of the slave. Add support for non-PREFIX archive location.

File:

• contrib/mpab/deploy_archives.sh (modified) (3 diffs)

contrib/mpab/deploy_archives.sh

@@ -4 +4 @@
     PORTLISTFILE=portlist
 fi
+
 if [[ -z "$PREFIX" ]]; then
     PREFIX="/opt/local"
 fi
-# FIXME: configure these
+
 # download server hostname
 if [[ -z "$DLHOST" ]]; then
     DLHOST=""
 fi
+
 # path where it keeps archives
 if [[ -z "$DLPATH" ]]; then
     DLPATH="/archives"
 fi
+
+# path where archives get uploaded to master
+if [[ -z "$ULPATH" ]]; then
+    ULPATH="${PREFIX}/var/macports/software"
+fi
+
 # private key to use for signing
 if [[ -z "$PRIVKEY" ]]; then
@@ -28 +36 @@
             portversion=$(${PREFIX}/bin/port info --version --line ${portname})
             portrevision=$(${PREFIX}/bin/port info --revision --line ${portname})
-            for archive in ${PREFIX}/var/macports/software/${portname}/${portname}-${portversion}_${portrevision}[+.]*; do
+            for archive in ${ULPATH}/${portname}/${portname}-${portversion}_${portrevision}[+.]*; do
                 aname=$(basename $archive)
                 echo deploying archive: $aname
@@ -35 +43 @@
                 fi
                 if [[ -n "$DLHOST" ]]; then
-                    ssh ${DLHOST} mkdir -p ${DLPATH}/${portname}
-                    rsync -av --ignore-existing ./${aname}.rmd160 ${archive} ${DLHOST}:${DLPATH}/${portname}
+                    ssh ${DLHOST} mkdir -p ${DLPATH}/${portname};
+                    rsync -av --ignore-existing ./${aname}.rmd160 ${archive} ${DLHOST}:${DLPATH}/${portname};
+                else
+                    mkdir -p ${DLPATH}/${portname};
+                    rsync -av --ignore-existing ./${aname}.rmd160 ${archive} ${DLPATH}/${portname};
                 fi
                 rm -f ./${aname}.rmd160