diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-03-09 18:15:51 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-03-10 08:50:44 +0000 |
| commit | 594c7a3f2f34d763b2b31b42fff6d0bae6663481 (patch) | |
| tree | a423bf1e5b498340840e6779e4fc5a6c1fd182f6 /configure.ac | |
| parent | 040d455cae75d961f01b39afe0bfb4b031345c5c (diff) | |
Clean up, using printf instead of echo
Change-Id: Id3723d0242711ba9b5450bb69b2ea09e614c90f6
Reviewed-on: https://gerrit.libreoffice.org/35014
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index dd945c927dad..c4d1edafdb66 100644 --- a/configure.ac +++ b/configure.ac @@ -3309,17 +3309,15 @@ win_get_env_from_vsvars32bat() if test $vcnum = "150"; then # Also seems to be located in another directory under the same name: vsvars32.bat # https://github.com/bazelbuild/bazel/blob/master/src/main/native/build_windows_jni.sh#L56-L57 - echo -e "@call \"`cygpath -w $VC_PRODUCT_DIR`/../Common7/Tools/VsDevCmd.bat\" /no_logo\r\n" >> $WRAPPERBATCHFILEPATH + printf '@call "%s/../Common7/Tools/VsDevCmd.bat" /no_logo\r\n' "$(cygpath -w $VC_PRODUCT_DIR)" > $WRAPPERBATCHFILEPATH else - echo -e "@call \"`cygpath -w $VC_PRODUCT_DIR`/../Common7/Tools/vsvars32.bat\"\r\n" >> $WRAPPERBATCHFILEPATH + printf '@call "%s/../Common7/Tools/vsvars32.bat"\r\n' "$(cygpath -w $VC_PRODUCT_DIR)" > $WRAPPERBATCHFILEPATH fi - echo -e "@setlocal\r\n" >> $WRAPPERBATCHFILEPATH - echo -e "@echo %$1%\r\n" >> $WRAPPERBATCHFILEPATH - echo -e "@endlocal\r\n" >> $WRAPPERBATCHFILEPATH + printf '@setlocal\r\n@echo %%%s%%\r\n@endlocal\r\n' "$1" >> $WRAPPERBATCHFILEPATH chmod +x $WRAPPERBATCHFILEPATH - _win_get_env_from_vsvars32bat=$($WRAPPERBATCHFILEPATH | tr -d "\r") + _win_get_env_from_vsvars32bat=$("$WRAPPERBATCHFILEPATH" | tr -d '\r') rm -f $WRAPPERBATCHFILEPATH - echo $_win_get_env_from_vsvars32bat + printf '%s' "$_win_get_env_from_vsvars32bat" } find_ucrt() @@ -3343,9 +3341,9 @@ find_ucrt() ide_env_file="${ide_env_dir}/vsvars32.bat" fi if test -f "$ide_env_file"; then - PathFormat "`win_get_env_from_vsvars32bat "UniversalCRTSdkDir"`" + PathFormat "$(win_get_env_from_vsvars32bat UniversalCRTSdkDir)" UCRTSDKDIR=$formatted_path - UCRTVERSION=`win_get_env_from_vsvars32bat "UCRTVersion"` + UCRTVERSION=$(win_get_env_from_vsvars32bat UCRTVersion) else AC_MSG_ERROR([No UCRT found]) fi |