From 1e9805902a21e9261380f895f576df17e19bb791 Mon Sep 17 00:00:00 2001 From: Mike Marchetti Date: Thu, 27 Jul 2017 15:43:44 -0400 Subject: [PATCH] add public key file to repo Change-Id: I81c96b242aaa3c7cebdc7b5bf422fe7479366496 Signed-off-by: Mike Marchetti --- tools/gen-repo.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/gen-repo.sh b/tools/gen-repo.sh index 480ca06f..b7bb2f5e 100755 --- a/tools/gen-repo.sh +++ b/tools/gen-repo.sh @@ -13,6 +13,7 @@ function usage() { echo -e " -r " echo -e " -h " echo -e " -R " + echo -e " -P " exit 1 } @@ -31,6 +32,7 @@ function dump_vars() { echo "BUILD: $BUILD" echo "RSYNC_USER_HOST $RSYNC_USER_HOST" echo "RSYNC_OPTIONS $RSYNC_OPTIONS" + echo "PUBLIC_KEY_FILE $PUBLIC_KEY_FILE" } IN_REPO="unstable" @@ -41,8 +43,9 @@ REPO_BASE=repo RELEASE_DIR=ReleaseTWO RSYNC_USER_HOST=osmusers@osm-download.etsi.org CURR_DIR=$(pwd) +PUBLIC_KEY_FILE=~/OSM\ ETSI\ Release\ Key.gpg -while getopts ":p:i:o:k:j::d:b:r:h:R:" o; do +while getopts ":p:i:o:k:j::d:b:r:h:R:P:" o; do case "${o}" in p) PASSPHRASE_FILE=${OPTARG} @@ -74,6 +77,9 @@ while getopts ":p:i:o:k:j::d:b:r:h:R:" o; do R) RSYNC_OPTIONS=${OPTARG} ;; + P) + PUBLIC_KEY_FILE=${OPTARG} + ;; *) usage exit 1 @@ -124,8 +130,10 @@ eval gpg $GPG_PASSPHRASE --no-tty --default-key $GPGKEY --clearsign -o dists/$OU rm -f dists/$OUT_REPO/Release.gpg eval gpg $GPG_PASSPHRASE --no-tty --default-key $GPGKEY -abs -o dists/$OUT_REPO/Release.gpg dists/$OUT_REPO/Release - echo "performing rsync of repo $RELEASE_DIR/dist/$OUT_REPO to osm-download.etsi.org:/repos/" cd $CURR_DIR/$REPO_BASE +# copy over the public key file +[ "$PUBLIC_KEY_FILE" ] && cp "$PUBLIC_KEY_FILE" osm/debian/$RELEASE_DIR + rsync -avR $RSYNC_OPTIONS osm/debian/$RELEASE_DIR rsync://$RSYNC_USER_HOST/repos -- 2.25.1