Skip to content
Browse files

Merge conflict resolution.

  • Loading branch information...
2 parents 5c87a0c + f139923 commit f5fa7ef070475fda85e2d4e99cdff3286197be3f @wayneeseguin wayneeseguin committed May 4, 2012
Showing with 4 additions and 5 deletions.
  1. +2 −3 bin/sm-installer
  2. +2 −2 core/internal/shell/templates/functions
View
5 bin/sm-installer
@@ -64,10 +64,9 @@ chmod +x "${sm_path}/bin/sm-zsh"
${sm_curl_command} -L https://github.com/${sm_owner}/sm/tarball/master -o "${sm_path}/archives/${sm_owner}-sm.tar.gz"
cd "${sm_path}/src/${sm_owner}-sm"
${sm_tar_command} xzf "${sm_path}/archives/${sm_owner}-sm.tar.gz"
-
-${sm_curl_command} https://smf.sh/mustache/$platform/sm-mustache -o ${sm_path}/bin/sm-mustache
-chmod +x "${sm_path}/bin/sm-mustache"
mv ${sm_owner}-sm-*/* .
+${sm_curl_command} https://smf.sh/mustache/$platform/sm-mustache -o ${sm_path}/src/${sm_owner}-sm/bin/sm-mustache
+chmod +x "${sm_path}/src/${sm_owner}-sm/bin/sm-mustache"
rm -rf ${sm_owner}-sm-*
"${sm_path}/bin/sm-zsh" ./install --zsh "${sm_path}/bin/sm-zsh" "$@"
View
4 core/internal/shell/templates/functions
@@ -97,9 +97,9 @@ __sm.templates.install()
do _data_string+="${_data[${_index}]}=${_data[$((_index+1))]}:~"
done
- _params+="${_data_string}\""
+ _params+=(" ${_data_string}\"" )
- if ! eval "${sm_path}/bin/sm-mustache ${_params[@]}"
+ if ! "${sm_path}/bin/sm-mustache" "${_params[@]}"
then log error "There was an error rendering the template!"
fi

0 comments on commit f5fa7ef

Please sign in to comment.
Something went wrong with that request. Please try again.