Merge pull request #301 from mvdbeek/bootstrapping-fix

Exclude curly braces from API-key to fix toolshed bootstrapping.
This commit is contained in:
Dannon Baker
2015-06-02 09:44:47 -04:00
@@ -76,7 +76,7 @@ while : ; do
done
echo -n "Retrieving admin user's API key from $local_shed_url..."
api_key=`curl -s --user $admin_user_email:$admin_user_password $local_shed_url/api/authenticate/baseauth/ | sed 's/..*api_key[^0-9a-f][^0-9a-f]*\([0-9a-f]*\)..*/\1/'`
api_key=`curl -s --user $admin_user_email:$admin_user_password $local_shed_url/api/authenticate/baseauth/ | sed 's/..*api_key[^0-9a-f][^0-9a-f]*\([0-9a-f]*\)..*/\1/'| sed 's/[{}]//g'`
if [[ -z $api_key && ${api_key+x} ]] ; then
stop_err "Error getting API key for user $admin_user_email."