Fix quote escaping issues in bash

This commit is contained in:
Nate McMaster 2017-12-20 10:55:34 -08:00
parent d66405bef1
commit a609297ebb
1 changed files with 8 additions and 8 deletions

16
run.sh
View File

@ -22,7 +22,7 @@ package_version_props_url=''
asset_root_url='' asset_root_url=''
access_token_suffix='' access_token_suffix=''
restore_sources='' restore_sources=''
msbuild_args='' msbuild_args=()
# #
# Functions # Functions
@ -208,7 +208,7 @@ while [[ $# -gt 0 ]]; do
verbose=true verbose=true
;; ;;
*) *)
msbuild_args+="\"$1\" " msbuild_args[${#msbuild_args[*]}]="$1"
;; ;;
esac esac
shift shift
@ -253,19 +253,19 @@ if [ ! -z "$package_version_props_url" ]; then
props_file_path="$intermediate_dir/external-dependencies.props" props_file_path="$intermediate_dir/external-dependencies.props"
mkdir -p "$intermediate_dir" mkdir -p "$intermediate_dir"
__get_remote_file "$package_version_props_url" "$props_file_path" __get_remote_file "$package_version_props_url" "$props_file_path"
msbuild_args+="-p:DotNetPackageVersionPropsPath=\"$props_file_path\" " msbuild_args[${#msbuild_args[*]}]="-p:DotNetPackageVersionPropsPath=$props_file_path"
fi fi
if [ ! -z "$restore_sources" ]; then if [ ! -z "$restore_sources" ]; then
msbuild_args+="-p:DotNetAdditionalRestoreSources=\"$restore_sources\" " msbuild_args[${#msbuild_args[*]}]="-p:DotNetAdditionalRestoreSources=$restore_sources"
fi fi
if [ ! -z "$asset_root_url" ]; then if [ ! -z "$asset_root_url" ]; then
msbuild_args+="-p:DotNetAssetRootUrl=\"$asset_root_url\" " msbuild_args[${#msbuild_args[*]}]="-p:DotNetAssetRootUrl=$asset_root_url"
fi fi
if [ ! -z "$asset_root_url" ]; then if [ ! -z "$access_token_suffix" ]; then
msbuild_args+="-p:DotNetAssetRootAccessTokenSuffix=\"$access_token_suffix\" " msbuild_args[${#msbuild_args[*]}]="-p:DotNetAssetRootAccessTokenSuffix=$access_token_suffix"
fi fi
[ -z "$channel" ] && channel='dev' [ -z "$channel" ] && channel='dev'
@ -273,4 +273,4 @@ fi
get_korebuild get_korebuild
set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file" set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file"
invoke_korebuild_command "$command" $msbuild_args invoke_korebuild_command "$command" "${msbuild_args[@]}"