commit/galaxy-central: dan: Fix toolshed bootstrapping for Macs.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/c9b13e2f3f6b/ Changeset: c9b13e2f3f6b User: dan Date: 2014-11-13 17:43:26+00:00 Summary: Fix toolshed bootstrapping for Macs. Affected #: 1 file diff -r 77676b9852282c0a240ebebb410374b233a1fa36 -r c9b13e2f3f6bb7f35f6ed9a012159c42519fac02 lib/tool_shed/scripts/bootstrap_tool_shed/bootstrap_tool_shed.sh --- a/lib/tool_shed/scripts/bootstrap_tool_shed/bootstrap_tool_shed.sh +++ b/lib/tool_shed/scripts/bootstrap_tool_shed/bootstrap_tool_shed.sh @@ -47,7 +47,7 @@ echo " done." -sed -i "s/#admin_users = user1@example.org,user2@example.org/admin_users = $admin_user_email/" ${TOOL_SHED_CONFIG_FILE} +sed -i"bak" "s/#admin_users = user1@example.org,user2@example.org/admin_users = $admin_user_email/" "${TOOL_SHED_CONFIG_FILE}" echo -n "Starting tool shed in order to populate users and categories... " if [ -f tool_shed_bootstrap.pid ] ; then @@ -76,7 +76,7 @@ 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]\+\).\+/\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/'` if [[ -z $api_key && ${api_key+x} ]] ; then stop_err "Error getting API key for user $admin_user_email." Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.
participants (1)
-
commits-noreply@bitbucket.org