diff --git a/.idea/misc.xml b/.idea/misc.xml index 6546f14..732146c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,5 +8,5 @@ - + \ No newline at end of file diff --git a/jpackage/run_jpackage.sh b/jpackage/run_jpackage.sh index 4f11aba..0f7fb9c 100755 --- a/jpackage/run_jpackage.sh +++ b/jpackage/run_jpackage.sh @@ -15,6 +15,7 @@ case "${unameOut}" in Darwin*) machine=mac;; CYGWIN*) machine=win;; MINGW*) machine=win;; + MSYS_NT*) machine=win;; *) machine="UNKNOWN:${unameOut}" esac echo Machine type detected ${machine} @@ -134,6 +135,7 @@ if [ "${machine}" = "win" ]; then else SIGNTOOL=$(which signtool) fi + echo Using SIGNTOOL=$SIGNTOOL if [ -z "$CERTUM_SHA" ]; then if [ ! -f "$SIGNTOOL_PFX" ]; then @@ -144,6 +146,8 @@ if [ "${machine}" = "win" ]; then echo "SIGNTOOL_CERT not set" fi fi + else + echo "Using CERTUM_SHA=$CERTUM_SHA" fi ls -lah jpackage/cert diff --git a/upload-packages.sh b/upload-packages.sh index 58bcbce..42a18eb 100644 --- a/upload-packages.sh +++ b/upload-packages.sh @@ -10,10 +10,10 @@ UPLOAD_FILES=("target/packages/Pdf Metadata Editor-${PUBLISH_VERSION}.msi") for f in "${UPLOAD_FILES[@]}"; do extension="${f##*.}" target="pmc/pdf-metadata-editor/release-files/$PUBLISH_VERSION/release.${extension}" - if mc stat $target > /dev/null ; then + if mc stat -q $target > /dev/null ; then echo $target already exists, skipping else echo Uploading $f as $target - mc cp "$f" + mc cp "$f" "$target" fi -done \ No newline at end of file +done