CLI script renaming

http-tests/admin/acl/add-put-authorization.sh

@@ -41,7 +41,7 @@ popd > /dev/null
 
 pushd . && cd "$SCRIPT_ROOT"
 
-root_ntriples=$(./get-document.sh \
+root_ntriples=$(./get.sh \
   -f "$OWNER_CERT_FILE" \
   -p "$OWNER_CERT_PWD" \
   --accept 'application/n-triples' \

http-tests/admin/acl/add-put-class-authorization.sh

@@ -41,7 +41,7 @@ popd > /dev/null
 
 pushd . && cd "$SCRIPT_ROOT"
 
-root_ntriples=$(./get-document.sh \
+root_ntriples=$(./get.sh \
   -f "$OWNER_CERT_FILE" \
   -p "$OWNER_CERT_PWD" \
   --accept 'application/n-triples' \

http-tests/admin/acl/add-put-group-authorization.sh

@@ -57,7 +57,7 @@ popd > /dev/null
 
 pushd . && cd "$SCRIPT_ROOT"
 
-root_ntriples=$(./get-document.sh \
+root_ntriples=$(./get.sh \
   -f "$OWNER_CERT_FILE" \
   -p "$OWNER_CERT_PWD" \
   --accept 'application/n-triples' \

http-tests/admin/model/create-property-constraint.sh

@@ -72,7 +72,7 @@ turtle+="_:item sioc:has_container <${END_USER_BASE_URL}> .\n"
 
 response=$(echo -e "$turtle" \
 | turtle --base="$END_USER_BASE_URL" \
-| ./put-document.sh \
+| ./put.sh \
   -f "$OWNER_CERT_FILE" \
   -p "$OWNER_CERT_PWD" \
   --content-type "text/turtle" \

http-tests/document-hierarchy/PUT-new-no-type.sh

@@ -40,7 +40,7 @@ pushd . > /dev/null && cd "$SCRIPT_ROOT"
 
 # check that a default RDF type was assigned to the new document
 
-./get-document.sh \
+./get.sh \
   -f "$AGENT_CERT_FILE" \
   -p "$AGENT_CERT_PWD" \
   --accept 'application/n-triples' \

http-tests/document-hierarchy/create-container.sh

@@ -35,7 +35,7 @@ container=$(./create-container.sh \
 
 # check that the item was created at the expected URL and attached to the document hierarchy
 
-./get-document.sh \
+./get.sh \
   -f "$AGENT_CERT_FILE" \
   -p "$AGENT_CERT_PWD" \
   --accept 'application/n-triples' \

http-tests/document-hierarchy/create-item.sh

@@ -35,7 +35,7 @@ item=$(./create-item.sh \
 
 # check that the item was created at the expected URL and attached to the document hierarchy
 
-./get-document.sh \
+./get.sh \
   -f "$AGENT_CERT_FILE" \
   -p "$AGENT_CERT_PWD" \
   --accept 'application/n-triples' \

http-tests/document-hierarchy/uploads/POST-rdf-source.sh

@@ -54,7 +54,7 @@ curl -w "%{http_code}\n" -o /dev/null -v -k \
 
 pushd . > /dev/null && cd "$SCRIPT_ROOT"
 
-doc_ntriples=$(./get-document.sh \
+doc_ntriples=$(./get.sh \
   -f "$AGENT_CERT_FILE" \
   -p "$AGENT_CERT_PWD" \
   --accept 'application/n-triples' \

http-tests/document-hierarchy/uploads/POST-rdf-upload.sh

@@ -70,7 +70,7 @@ echo -e "$rdf_post" \
 
 pushd . > /dev/null && cd "$SCRIPT_ROOT"
 
-doc_ntriples=$(./get-document.sh \
+doc_ntriples=$(./get.sh \
   -f "$AGENT_CERT_FILE" \
   -p "$AGENT_CERT_PWD" \
   --accept 'application/n-triples' \

http-tests/imports/GET-file-range.sh

@@ -41,7 +41,7 @@ popd > /dev/null
 
 pushd . > /dev/null && cd "$SCRIPT_ROOT"
 
-file_doc_ntriples=$(./get-document.sh \
+file_doc_ntriples=$(./get.sh \
   -f "$AGENT_CERT_FILE" \
   -p "$AGENT_CERT_PWD" \
   --accept 'application/n-triples' \

http-tests/imports/GET-file-sha1sum.sh

@@ -41,7 +41,7 @@ popd > /dev/null
 
 pushd . > /dev/null && cd "$SCRIPT_ROOT"
 
-file_doc_ntriples=$(./get-document.sh \
+file_doc_ntriples=$(./get.sh \
   -f "$AGENT_CERT_FILE" \
   -p "$AGENT_CERT_PWD" \
   --accept 'application/n-triples' \

http-tests/imports/create-file.sh

@@ -37,7 +37,7 @@ file_doc=$(./create-file.sh \
 
 pushd . > /dev/null && cd "$SCRIPT_ROOT"
 
-file_doc_ntriples=$(./get-document.sh \
+file_doc_ntriples=$(./get.sh \
   -f "$AGENT_CERT_FILE" \
   -p "$AGENT_CERT_PWD" \
   --accept 'application/n-triples' \

http-tests/misc/admin-webid-delegation.sh

@@ -11,7 +11,7 @@ pushd . > /dev/null && cd "$SCRIPT_ROOT"
 
 # check that the acl:delegates triple exists in the agent's description
 
-./get-document.sh \
+./get.sh \
   -f "$AGENT_CERT_FILE" \
   -p "$AGENT_CERT_PWD" \
   --accept 'application/n-triples' \

http-tests/misc/webid-delegation.sh

@@ -11,7 +11,7 @@ pushd . > /dev/null && cd "$SCRIPT_ROOT"
 
 # check that the acl:delegates triple exists in the agent's description
 
-./get-document.sh \
+./get.sh \
   -f "$AGENT_CERT_FILE" \
   -p "$AGENT_CERT_PWD" \
   --accept 'application/n-triples' \

scripts/admin/acl/create-authorization.sh

@@ -242,4 +242,4 @@ if [ -n "$write" ] ; then
 fi
 
 # submit Turtle doc to the server
-echo -e "$turtle" | turtle --base="$base" | ../../put-document.sh "${args[@]}"
+echo -e "$turtle" | turtle --base="$base" | ../../put.sh "${args[@]}"

scripts/admin/acl/create-group.sh

@@ -155,4 +155,4 @@ do
 done
 
 # submit Turtle doc to the server
-echo -e "$turtle" | turtle --base="$base" | ../../put-document.sh "${args[@]}"
+echo -e "$turtle" | turtle --base="$base" | ../../put.sh "${args[@]}"

scripts/admin/model/create-class.sh

@@ -178,4 +178,4 @@ do
 done
 
 # submit Turtle doc to the server
-echo -e "$turtle" | turtle --base="$base" | ../../create-document.sh "${args[@]}"
+echo -e "$turtle" | turtle --base="$base" | ../../post.sh "${args[@]}"

scripts/admin/model/create-construct.sh

@@ -157,4 +157,4 @@ if [ -n "$fragment" ] ; then
 fi
 
 # submit Turtle doc to the server
-echo -e "$turtle" | turtle --base="$base" | ../../create-document.sh "${args[@]}"
+echo -e "$turtle" | turtle --base="$base" | ../../post.sh "${args[@]}"

scripts/admin/model/create-ontology.sh

@@ -143,4 +143,4 @@ if [ -n "$fragment" ] ; then
 fi
 
 # submit Turtle doc to the server
-echo -e "$turtle" | turtle --base="$base" | ../../create-document.sh "${args[@]}"
+echo -e "$turtle" | turtle --base="$base" | ../../post.sh "${args[@]}"

scripts/admin/model/create-property-constraint.sh

@@ -156,4 +156,4 @@ if [ -n "$fragment" ] ; then
 fi
 
 # submit Turtle doc to the server
-echo -e "$turtle" | turtle --base="$base" | ../../create-document.sh "${args[@]}"
+echo -e "$turtle" | turtle --base="$base" | ../../post.sh "${args[@]}"

scripts/admin/model/create-restriction.sh

@@ -175,4 +175,4 @@ if [ -n "$has_value" ] ; then
 fi
 
 # submit Turtle doc to the server
-echo -e "$turtle" | turtle --base="$base" | ../../create-document.sh "${args[@]}"
+echo -e "$turtle" | turtle --base="$base" | ../../post.sh "${args[@]}"

scripts/admin/model/create-select.sh

@@ -167,4 +167,4 @@ if [ -n "$fragment" ] ; then
 fi
 
 # submit Turtle doc to the server
-echo -e "$turtle" | turtle --base="$base" | ../../create-document.sh "${args[@]}"
+echo -e "$turtle" | turtle --base="$base" | ../../post.sh "${args[@]}"

scripts/create-container.sh

@@ -142,4 +142,4 @@ if [ -n "$description" ] ; then
     turtle+="<${parent}${encoded_slug}/> dct:description \"${description}\" .\n"
 fi
 
-echo -e "$turtle" | turtle --base="$base" | ./put-document.sh "${args[@]}"
+echo -e "$turtle" | turtle --base="$base" | ./put.sh "${args[@]}"

scripts/create-generic-service.sh

@@ -168,4 +168,4 @@ if [ -n "$fragment" ] ; then
 fi
 
 # submit Turtle doc to the server
-echo -e "$turtle" | turtle --base="$base" | ./put-document.sh "${args[@]}"
+echo -e "$turtle" | turtle --base="$base" | ./put.sh "${args[@]}"

scripts/create-item.sh

@@ -121,4 +121,4 @@ if [ -n "$description" ] ; then
 fi
 
 
-echo -e "$turtle" | turtle --base="$base" | ./put-document.sh "${args[@]}"
+echo -e "$turtle" | turtle --base="$base" | ./put.sh "${args[@]}"

scripts/create-result-set-chart.sh

@@ -172,4 +172,4 @@ if [ -n "$fragment" ] ; then
 fi
 
 # submit Turtle doc to the server
-echo -e "$turtle" | turtle --base="$base" | ./put-document.sh "${args[@]}"
+echo -e "$turtle" | turtle --base="$base" | ./put.sh "${args[@]}"

scripts/create-select.sh

@@ -149,4 +149,4 @@ if [ -n "$fragment" ] ; then
 fi
 
 # submit Turtle doc to the server
-echo -e "$turtle" | turtle --base="$base" | ./put-document.sh "${args[@]}"
+echo -e "$turtle" | turtle --base="$base" | ./put.sh "${args[@]}"

scripts/imports/create-csv-import.sh

@@ -161,4 +161,4 @@ if [ -n "$fragment" ] ; then
 fi
 
 # submit Turtle doc to the server
-echo -e "$turtle" | turtle --base="$base" | ../put-document.sh "${args[@]}"
+echo -e "$turtle" | turtle --base="$base" | ../put.sh "${args[@]}"

scripts/imports/create-file.sh

@@ -174,4 +174,4 @@ if [ -n "$description" ] ; then
 fi
 
 # POST RDF/POST multipart form from stdin to the server
-echo -e "$rdf_post" | curl -s -k -X PUT -H "Accept: text/turtle" -E "$cert_pem_file":"$cert_password" --config - "$target" -v -D - | tr -d '\r' | sed -En 's/^Location: (.*)$/\1/p'
+echo -e "$rdf_post" | curl -w '%{url_effective}\n' -k -X PUT -H "Accept: text/turtle" -E "$cert_pem_file":"$cert_password" -o /dev/null "$target"

scripts/imports/create-query.sh

@@ -140,4 +140,4 @@ if [ -n "$fragment" ] ; then
 fi
 
 # submit Turtle doc to the server
-echo -e "$turtle" | turtle --base="$base" | ../put-document.sh "${args[@]}"
+echo -e "$turtle" | turtle --base="$base" | ../put.sh "${args[@]}"

scripts/imports/create-rdf-import.sh

@@ -158,4 +158,4 @@ if [ -n "$fragment" ] ; then
 fi
 
 # submit Turtle doc to the server
-echo -e "$turtle" | turtle --base="$base" | ../put-document.sh "${args[@]}"
+echo -e "$turtle" | turtle --base="$base" | ../put.sh "${args[@]}"

scripts/imports/import-csv.sh

@@ -151,7 +151,7 @@ query_doc=$(./create-query.sh \
 
 pushd . > /dev/null && cd "$SCRIPT_ROOT"
 
-query_ntriples=$(./get-document.sh \
+query_ntriples=$(./get.sh \
   -f "$cert_pem_file" \
   -p "$cert_password" \
   --proxy "$proxy" \
@@ -177,7 +177,7 @@ file_doc=$(./create-file.sh \
 
 pushd . > /dev/null && cd "$SCRIPT_ROOT"
 
-file_ntriples=$(./get-document.sh \
+file_ntriples=$(./get.sh \
   -f "$cert_pem_file" \
   -p "$cert_password" \
   --proxy "$proxy" \

scripts/imports/import-rdf.sh

@@ -155,7 +155,7 @@ if [ -n "$query_file" ] ; then
 
     pushd . > /dev/null && cd "$SCRIPT_ROOT"
 
-    query_ntriples=$(./get-document.sh \
+    query_ntriples=$(./get.sh \
       -f "$cert_pem_file" \
       -p "$cert_password" \
       --proxy "$proxy" \
@@ -182,7 +182,7 @@ file_doc=$(./create-file.sh \
 
 pushd . > /dev/null && cd "$SCRIPT_ROOT"
 
-file_ntriples=$(./get-document.sh \
+file_ntriples=$(./get.sh \
   -f "$cert_pem_file" \
   -p "$cert_password" \
   --proxy "$proxy" \

scripts/create-document.sh → scripts/post.sh

@@ -76,5 +76,5 @@ if [ -n "$proxy" ]; then
     target="${target/$target_host/$proxy_host}"
 fi
 
-# POST RDF document from stdin to the server and print Location URL
-cat - | curl -v -k -E "$cert_pem_file":"$cert_password" -d @- -H "Content-Type: ${content_type}" -H "Accept: text/turtle" "$target" -v -D - | tr -d '\r' | sed -En 's/^Location: (.*)/\1/p'
+# POST RDF document from stdin to the server and print request URL
+cat - | curl -w '%{url_effective}\n' -k -E "$cert_pem_file":"$cert_password" -d @- -H "Content-Type: ${content_type}" -H "Accept: text/turtle" -o /dev/null "$target"

scripts/put-document.sh → scripts/put.sh

@@ -76,5 +76,5 @@ if [ -n "$proxy" ]; then
     target="${target/$target_host/$proxy_host}"
 fi
 
-# POST RDF document from stdin to the server and print Location URL
-cat - | curl -v -k -E "$cert_pem_file":"$cert_password" -d @- -X PUT -H "Content-Type: ${content_type}" -H "Accept: text/turtle" "$target" -v -D - | tr -d '\r' | sed -En 's/^Location: (.*)/\1/p'
+# POST RDF document from stdin to the server and print request URL
+cat - | curl -w '%{url_effective}\n' -k -E "$cert_pem_file":"$cert_password" -d @- -X PUT -H "Content-Type: ${content_type}" -H "Accept: text/turtle" -o /dev/null "$target"