Changes to publishing scripts.origin/1.11

2 files changed, 17 insertions, 23 deletions

diff --git a/Setup/Publish-GitHub.sh b/Setup/Publish-GitHub.sh
index 75b87f0..c67f8f6 100644
--- a/Setup/Publish-GitHub.sh
+++ b/Setup/Publish-GitHub.sh
@@ -25,7 +25,7 @@ if [[ "$BRANCH" == "master" ]]; then
 

             for FILE_EXTENSION in "exe" "zip"; do

                 if [ ! -e ../Releases/$FILE_PREFIX.$FILE_EXTENSION ]; then                

-                    echo "Executables cannot be found ($FILE_PREFIX.$FILE_EXTENSION)." >&2

+                    echo "Executables cannot be found." >&2

                     exit 1

                 fi

             done

@@ -37,7 +37,7 @@ if [[ "$BRANCH" == "master" ]]; then
         

             git push origin :refs/tags/latest 2> /dev/null

             

-            ASSET_UPLOAD_URL=`curl -s -H "Authorization: token $TOKEN" --data "{\"tag_name\": \"latest\", \"target_commitish\": \"master\", \"name\": \"Most recent build\", \"body\": \"This is the most recent automated build.\n\nFor the latest stable release go to https://www.medo64.com/$REPOSITORY/.\", \"draft\": false, \"prerelease\": true}" -X POST https://api.github.com/repos/$OWNER/$REPOSITORY/releases | grep "\"upload_url\"" | cut -d\" -f4 | cut -d{ -f1`

+            ASSET_UPLOAD_URL=`curl -s -H "Authorization: token $TOKEN" --data "{\"tag_name\": \"latest\", \"target_commitish\": \"master\", \"name\": \"Most recent build\", \"body\": \"This is the most recent automated build (#$VERSION_HASH, revision $VERSION_NUMBER).\n\nFor the latest stable release go to https://www.medo64.com/$REPOSITORY/.\", \"draft\": false, \"prerelease\": true}" -X POST https://api.github.com/repos/$OWNER/$REPOSITORY/releases | grep "\"upload_url\"" | cut -d\" -f4 | cut -d{ -f1`

             for FILE_EXTENSION in "exe" "zip"; do

                 UPLOAD_RESULT=`curl -s -H "Authorization: token $TOKEN" -H "Content-Type: application/octet-stream" --data-binary @../Releases/$FILE_PREFIX.$FILE_EXTENSION -X POST $ASSET_UPLOAD_URL?name=$FILE_PREFIX.$FILE_EXTENSION`

                 echo $UPLOAD_RESULT | grep --quiet "browser_download_url"

diff --git a/Setup/Publish.cmd b/Setup/Publish.cmd
index 8317937..eb2497c 100644
--- a/Setup/Publish.cmd
+++ b/Setup/Publish.cmd
@@ -10,10 +10,9 @@ SET    COMPILE_TOOL_1="%PROGRAMFILES(X86)%\Microsoft Visual Studio 14.0\Common7\
 SET    COMPILE_TOOL_2="%PROGRAMFILES(X86)%\Microsoft Visual Studio 14.0\Common7\IDE\WDExpress.exe"

 SET        SETUP_TOOL="%PROGRAMFILES(x86)%\Inno Setup 5\iscc.exe"

 

-SET       SIGN_TOOL_1="%PROGRAMFILES(X86)%\Windows Kits\10\bin\x86\signtool.exe"

-SET       SIGN_TOOL_2="%PROGRAMFILES(X86)%\Windows Kits\8.1\bin\x86\signtool.exe"

-SET       SIGN_TOOL_3="%PROGRAMFILES(X86)%\Windows Kits\8.0\bin\x86\signtool.exe"

-SET         SIGN_HASH="C02FF227D5EE9F555C13D4C622697DF15C6FF871"

+SET       SIGN_TOOL_1="%PROGRAMFILES(X86)%\Windows Kits\8.1\bin\x86\signtool.exe"

+SET       SIGN_TOOL_2="%PROGRAMFILES(X86)%\Windows Kits\8.0\bin\x86\signtool.exe"

+SET   SIGN_THUMBPRINT="df26e797ffaee47a40c1fab756e995d3763da968"

 SET SIGN_TIMESTAMPURL="http://timestamp.comodoca.com/rfc3161"

 

 SET        GIT_TOOL_1="%PROGRAMFILES%\Git\mingw64\bin\git.exe"

@@ -43,20 +42,15 @@ IF EXIST %SETUP_TOOL% (
 )

 

 IF EXIST %SIGN_TOOL_1% (

-    ECHO Windows SignTool 10

+    ECHO Windows SignTool 8.1

     SET SIGN_TOOL=%SIGN_TOOL_1%

 ) ELSE (

     IF EXIST %SIGN_TOOL_2% (

-        ECHO Windows SignTool 8.1

+        ECHO Windows SignTool 8.0

         SET SIGN_TOOL=%SIGN_TOOL_2%

     ) ELSE (

-        IF EXIST %SIGN_TOOL_3% (

-            ECHO Windows SignTool 8.0

-            SET SIGN_TOOL=%SIGN_TOOL_3%

-        ) ELSE (

-            ECHO Cannot find Windows SignTool^^!

-            PAUSE && EXIT /B 255

-        )

+        ECHO Cannot find Windows SignTool^^!

+        PAUSE && EXIT /B 255

     )

 )

 

@@ -106,22 +100,22 @@ ECHO.
 ECHO.

 

 

-CERTUTIL -silent -verifystore -user My %SIGN_HASH% > NUL

+CERTUTIL -silent -verifystore -user My %SIGN_THUMBPRINT% > NUL

 IF %ERRORLEVEL%==0 (

     ECHO --- SIGN SOLUTION

     ECHO.

     

     IF [%SIGN_TIMESTAMPURL%]==[] (

-        %SIGN_TOOL% sign /s "My" /sha1 %SIGN_HASH% /v %FILES_EXECUTABLE%

+        %SIGN_TOOL% sign /s "My" /sha1 %SIGN_THUMBPRINT% /v %FILES_EXECUTABLE%

     ) ELSE (

-        %SIGN_TOOL% sign /s "My" /sha1 %SIGN_HASH% /tr %SIGN_TIMESTAMPURL% /v %FILES_EXECUTABLE%

+        %SIGN_TOOL% sign /s "My" /sha1 %SIGN_THUMBPRINT% /tr %SIGN_TIMESTAMPURL% /v %FILES_EXECUTABLE%

     )

     IF ERRORLEVEL 1 PAUSE && EXIT /B %ERRORLEVEL%

 ) ELSE (

     ECHO --- DID NOT SIGN SOLUTION

-    IF NOT [%SIGN_HASH%]==[] (

+    IF NOT [%SIGN_THUMBPRINT%]==[] (

         ECHO.

-        ECHO No certificate with hash %SIGN_HASH%.

+        ECHO No certificate with hash %SIGN_THUMBPRINT%.

     ) 

 )

 ECHO.

@@ -160,15 +154,15 @@ ECHO.
 ECHO.

 

 

-CERTUTIL -silent -verifystore -user My %SIGN_HASH% > NUL

+CERTUTIL -silent -verifystore -user My %SIGN_THUMBPRINT% > NUL

 IF %ERRORLEVEL%==0 (

     ECHO --- SIGN SETUP

     ECHO.

     

     IF [%SIGN_TIMESTAMPURL%]==[] (

-        %SIGN_TOOL% sign /s "My" /sha1 %SIGN_HASH% /v ".\Temp\%_SETUPEXE%"

+        %SIGN_TOOL% sign /s "My" /sha1 %SIGN_THUMBPRINT% /v ".\Temp\%_SETUPEXE%"

     ) ELSE (

-        %SIGN_TOOL% sign /s "My" /sha1 %SIGN_HASH% /tr %SIGN_TIMESTAMPURL% /v ".\Temp\%_SETUPEXE%"

+        %SIGN_TOOL% sign /s "My" /sha1 %SIGN_THUMBPRINT% /tr %SIGN_TIMESTAMPURL% /v ".\Temp\%_SETUPEXE%"

     )

     IF ERRORLEVEL 1 PAUSE && EXIT /B %ERRORLEVEL%

 ) ELSE (