Expand current file path only at the beggining and store it.

"%~dp0" would fail if requested after directory changes internally.
Also add quotes in case of spaces in path.

Add usr/bin to the path.

3 files changed, 26 insertions, 24 deletions

diff --git a/contrib/coverity.bat b/contrib/coverity.bat
index 6cf5feed4..f60a71d91 100755
--- a/contrib/coverity.bat
+++ b/contrib/coverity.bat
@@ -18,13 +18,14 @@ REM along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 SETLOCAL
+SET "FILE_DIR=%~dp0"
+PUSHD "%FILE_DIR%"
 
-PUSHD %~dp0
-SET "COMMMON=%~dp0..\common.bat"
+SET "COMMON=%FILE_DIR%..\common.bat"
 
 IF EXIST "..\build.user.bat" CALL "..\build.user.bat"
 
-IF NOT EXIST "%COV_PATH%" (CALL %COMMON% :SubMsg "ERROR" "Coverity not found in '%COV_PATH%'" & EXIT /B)
+IF NOT EXIST "%COV_PATH%" (CALL "%COMMON%" :SubMsg "ERROR" "Coverity not found in '%COV_PATH%'" & EXIT /B)
 
 
 :Cleanup
@@ -44,12 +45,12 @@ CALL "..\build.bat" clean Api Both Release silent
 "%COV_PATH%\bin\cov-build.exe" --dir cov-int "..\build.bat" Build Filters Both Release silent
 "%COV_PATH%\bin\cov-build.exe" --dir cov-int "..\build.bat" Build IconLib Both Release silent
 "%COV_PATH%\bin\cov-build.exe" --dir cov-int "..\build.bat" Build Api Both Release silent
-IF %ERRORLEVEL% NEQ 0 (CALL %COMMON% :SubMsg "ERROR" "Build failed." & EXIT /B)
+IF %ERRORLEVEL% NEQ 0 (CALL "%COMMON%" :SubMsg "ERROR" "Build failed." & EXIT /B)
 
 
 :tar
-CALL %COMMON% :SubDetectTar
-IF NOT EXIST "%TAR%" (CALL %COMMON% :SubMsg "WARNING" "tar not found. Trying 7-zip..." & GOTO SevenZip)
+CALL "%COMMON%" :SubDetectTar
+IF NOT EXIST "%TAR%" (CALL "%COMMON%" :SubMsg "WARNING" "tar not found. Trying 7-zip..." & GOTO SevenZip)
 
 SET "FILE_NAME=MPC-HC.tar.xz"
 SET "XZ_OPT=-9e"
@@ -64,37 +65,37 @@ IF %ERRORLEVEL% NEQ 0 (
   %TAR% cJf %FILE_NAME% cov-int
 )
 
-IF %ERRORLEVEL% NEQ 0 (CALL %COMMON% :SubMsg "WARNING" "tar failed. Trying 7-zip..." & GOTO SevenZip)
+IF %ERRORLEVEL% NEQ 0 (CALL "%COMMON%" :SubMsg "WARNING" "tar failed. Trying 7-zip..." & GOTO SevenZip)
 GOTO Upload
 
 
 :SevenZip
-CALL %COMMON% :SubDetectSevenzipPath
-IF NOT EXIST "%SEVENZIP%" (CALL %COMMON% :SubMsg "ERROR" "7-zip not found." & EXIT /B)
+CALL "%COMMON%" :SubDetectSevenzipPath
+IF NOT EXIST "%SEVENZIP%" (CALL "%COMMON%" :SubMsg "ERROR" "7-zip not found." & EXIT /B)
 
 SET "FILE_NAME=MPC-HC.tgz"
 REM 7-Zip doesn't support tarball compliant LZMA2 archives, just use tar/gzip.
 "%SEVENZIP%" a -ttar "MPC-HC.tar" "cov-int"
-IF %ERRORLEVEL% NEQ 0 (CALL %COMMON% :SubMsg "ERROR" "7-zip failed." & EXIT /B)
+IF %ERRORLEVEL% NEQ 0 (CALL "%COMMON%" :SubMsg "ERROR" "7-zip failed." & EXIT /B)
 "%SEVENZIP%" a -tgzip "%FILE_NAME%" "MPC-HC.tar"
-IF %ERRORLEVEL% NEQ 0 (CALL %COMMON% :SubMsg "ERROR" "7-zip failed." & EXIT /B)
+IF %ERRORLEVEL% NEQ 0 (CALL "%COMMON%" :SubMsg "ERROR" "7-zip failed." & EXIT /B)
 IF EXIST "MPC-HC.tar" DEL "MPC-HC.tar"
 GOTO Upload
 
 
 :Upload
 CALL "..\build.bat" GetVersion
-CALL %COMMON% :SubDetectCurl
-IF NOT EXIST "%CURL%" (CALL %COMMON% :SubMsg "WARNING" "curl not found. Upload aborted." & GOTO End)
-IF NOT DEFINED COV_TOKEN (CALL %COMMON% :SubMsg "WARNING" "COV_TOKEN not defined. Upload aborted." & GOTO End)
-IF NOT DEFINED COV_EMAIL (CALL %COMMON% :SubMsg "WARNING" "COV_EMAIL not defined. Upload aborted." & GOTO End)
+CALL "%COMMON%" :SubDetectCurl
+IF NOT EXIST "%CURL%" (CALL "%COMMON%" :SubMsg "WARNING" "curl not found. Upload aborted." & GOTO End)
+IF NOT DEFINED COV_TOKEN (CALL "%COMMON%" :SubMsg "WARNING" "COV_TOKEN not defined. Upload aborted." & GOTO End)
+IF NOT DEFINED COV_EMAIL (CALL "%COMMON%" :SubMsg "WARNING" "COV_EMAIL not defined. Upload aborted." & GOTO End)
 %CURL% --form token=%COV_TOKEN% --form email=%COV_EMAIL% --form file=@%FILE_NAME% --form version=%MPCHC_HASH% https://scan.coverity.com/builds?project=MPC-HC -o cov_upload.log
 GOTO End
 
 
 :End
 POPD
-CALL %COMMON% :SubMsg "INFO" "Done. Press any key to exit..."
+CALL "%COMMON%" :SubMsg "INFO" "Done. Press any key to exit..."
 PAUSE >NUL
 ENDLOCAL
 EXIT /B
diff --git a/contrib/run_astyle.bat b/contrib/run_astyle.bat
index 7e75e8b83..e90f69bfb 100755
--- a/contrib/run_astyle.bat
+++ b/contrib/run_astyle.bat
@@ -1,5 +1,5 @@
 @ECHO OFF
-REM (C) 2012-2014 see Authors.txt
+REM (C) 2012-2015 see Authors.txt
 REM
 REM This file is part of MPC-HC.
 REM
@@ -18,8 +18,8 @@ REM along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 SETLOCAL
-
-PUSHD %~dp0
+SET "FILE_DIR=%~dp0"
+PUSHD "%FILE_DIR%"
 
 SET "AStyleVerReq=2.05.1"
 astyle --version 2>NUL || (ECHO. & ECHO ERROR: AStyle not found & GOTO End)
@@ -27,7 +27,7 @@ CALL :SubCheckVer || GOTO End
 
 
 :Start
-TITLE Running astyle using %~dp0astyle.ini
+TITLE Running astyle using %FILE_DIR%astyle.ini
 
 IF "%~1" == "" (
   astyle -r --options=astyle.ini ..\*.h ..\*.cpp
diff --git a/contrib/sign.bat b/contrib/sign.bat
index d5711b41f..8134fd341 100755
--- a/contrib/sign.bat
+++ b/contrib/sign.bat
@@ -1,5 +1,5 @@
 @ECHO OFF

-REM (C) 2013 see Authors.txt

+REM (C) 2013, 2015 see Authors.txt

 REM

 REM This file is part of MPC-HC.

 REM

@@ -18,6 +18,7 @@ REM along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

 

 SETLOCAL

+SET "FILE_DIR=%~dp0"

 

 IF "%~1" == "" (

   ECHO %~nx0: No input specified!

@@ -31,14 +32,14 @@ IF NOT DEFINED VS120COMNTOOLS (
   GOTO END

 )

 

-IF NOT EXIST "%~dp0..\signinfo.txt" (

-  ECHO %~nx0: %~dp0..\signinfo.txt is not present!

+IF NOT EXIST "%FILE_DIR%..\signinfo.txt" (

+  ECHO %~nx0: %FILE_DIR%..\signinfo.txt is not present!

   SET SIGN_ERROR=True

   GOTO END

 )

 

 SET SIGN_CMD=

-SET /P SIGN_CMD=<%~dp0..\signinfo.txt

+SET /P SIGN_CMD=<"%FILE_DIR%..\signinfo.txt"

 

 TITLE Signing "%~1"...

 ECHO. & ECHO Signing "%~1"...