Scripts moved to bin and added to PATH

.github/workflows/http-tests.yml

@@ -18,11 +18,16 @@ jobs:
       - name: Unpack Jena
         run: tar -zxf jena.tar.gz
         working-directory: ${{ runner.temp }}
-      - name: Set JENA_HOME and Update PATH
+      - name: Set JENA_HOME and update PATH
         run: |
           echo "${{ runner.temp }}/apache-jena-${{ env.JENA_VERSION }}/bin" >> $GITHUB_PATH
       - name: Checkout code
         uses: actions/checkout@v3
+      - name: Add all subdirectories in bin/ to PATH
+        run: |
+          for d in "bin"/*/; do
+            echo "$d" >> "$GITHUB_PATH"
+          done
       - name: Generating server certificate
         run: ../scripts/server-cert-gen.sh .env nginx ssl
         working-directory: http-tests

scripts/add-generic-service.sh → bin/add-generic-service.sh

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

scripts/add-object-block.sh → bin/add-object-block.sh

@@ -98,7 +98,7 @@ fi
 
 target="$1"
 
-ntriples=$(./get.sh \
+ntriples=$(get.sh \
   -f "$cert_pem_file" \
   -p "$cert_password" \
  --proxy "$proxy" \
@@ -143,4 +143,4 @@ if [ -n "$mode" ] ; then
 fi
 
 # submit Turtle doc to the server
-echo -e "$turtle" | ./post.sh "${args[@]}"
+echo -e "$turtle" | post.sh "${args[@]}"

scripts/add-result-set-chart.sh → bin/add-result-set-chart.sh

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

scripts/add-select.sh → bin/add-select.sh

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

scripts/add-view.sh → bin/add-view.sh

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

scripts/add-xhtml-block.sh → bin/add-xhtml-block.sh

@@ -92,7 +92,7 @@ fi
 
 target="$1"
 
-ntriples=$(./get.sh \
+ntriples=$(get.sh \
   -f "$cert_pem_file" \
   -p "$cert_password" \
  --proxy "$proxy" \
@@ -133,4 +133,4 @@ if [ -n "$description" ] ; then
 fi
 
 # submit Turtle doc to the server
-echo -e "$turtle" | ./post.sh "${args[@]}"
+echo -e "$turtle" | post.sh "${args[@]}"

scripts/admin/acl/create-authorization.sh → bin/admin/acl/create-authorization.sh

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

scripts/admin/acl/create-group.sh → bin/admin/acl/create-group.sh

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

scripts/admin/model/add-class.sh → bin/admin/model/add-class.sh

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

scripts/admin/model/add-construct.sh → bin/admin/model/add-construct.sh

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

scripts/admin/model/add-property-constraint.sh → bin/admin/model/add-property-constraint.sh

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

scripts/admin/model/add-restriction.sh → bin/admin/model/add-restriction.sh

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

scripts/admin/model/add-select.sh → bin/admin/model/add-select.sh

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

scripts/admin/model/create-ontology.sh → bin/admin/model/create-ontology.sh

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

scripts/create-container.sh → bin/create-container.sh

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

scripts/create-item.sh → bin/create-item.sh

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

scripts/imports/create-csv-import.sh → bin/imports/create-csv-import.sh

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

scripts/imports/create-query.sh → bin/imports/create-query.sh

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

scripts/imports/create-rdf-import.sh → bin/imports/create-rdf-import.sh

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

scripts/imports/import-csv.sh → bin/imports/import-csv.sh

@@ -139,7 +139,7 @@ if [ -z "$proxy" ] ; then
     proxy="$base"
 fi
 
-query_doc=$(./create-query.sh \
+query_doc=$(create-query.sh \
   -b "$base" \
   -f "$cert_pem_file" \
   -p "$cert_password" \
@@ -149,21 +149,17 @@ query_doc=$(./create-query.sh \
   --query-file "$query_file"
 )
 
-pushd . > /dev/null && cd "$SCRIPT_ROOT"
-
-query_ntriples=$(./get.sh \
+query_ntriples=$(get.sh \
   -f "$cert_pem_file" \
   -p "$cert_password" \
   --proxy "$proxy" \
   --accept 'application/n-triples' \
   "$query_doc"
 )
 
-popd > /dev/null
-
 query=$(echo "$query_ntriples" | sed -rn "s/<${query_doc//\//\\/}> <http:\/\/xmlns.com\/foaf\/0.1\/primaryTopic> <(.*)> \./\1/p" | head -1)
 
-file_doc=$(./create-file.sh \
+file_doc=$(create-file.sh \
   -b "$base" \
   -f "$cert_pem_file" \
   -p "$cert_password" \
@@ -175,20 +171,16 @@ file_doc=$(./create-file.sh \
   --file-content-type "text/csv"
 )
 
-pushd . > /dev/null && cd "$SCRIPT_ROOT"
-
-file_ntriples=$(./get.sh \
+file_ntriples=$(get.sh \
   -f "$cert_pem_file" \
   -p "$cert_password" \
   --proxy "$proxy" \
   --accept 'application/n-triples' \
   "$file_doc")
 
-popd > /dev/null
-
 file=$(echo "$file_ntriples" | sed -rn "s/<${file_doc//\//\\/}> <http:\/\/xmlns.com\/foaf\/0.1\/primaryTopic> <(.*)> \./\1/p" | head -1)
 
-./create-csv-import.sh \
+create-csv-import.sh \
   -b "$base" \
   -f "$cert_pem_file" \
   -p "$cert_password" \
@@ -197,4 +189,5 @@ file=$(echo "$file_ntriples" | sed -rn "s/<${file_doc//\//\\/}> <http:\/\/xmlns.
   --slug "$import_slug" \
   --query "$query" \
   --file "$file" \
-  --delimiter "$delimiter"
+  --delimiter "$delimiter"
+

scripts/imports/import-rdf.sh → bin/imports/import-rdf.sh

@@ -143,7 +143,7 @@ if [ -z "$proxy" ] ; then
 fi
 
 if [ -n "$query_file" ] ; then
-    query_doc=$(./create-query.sh \
+    query_doc=$(create-query.sh \
       -b "$base" \
       -f "$cert_pem_file" \
       -p "$cert_password" \
@@ -153,22 +153,18 @@ if [ -n "$query_file" ] ; then
       --query-file "$query_file"
     )
 
-    pushd . > /dev/null && cd "$SCRIPT_ROOT"
-
-    query_ntriples=$(./get.sh \
+    query_ntriples=$(get.sh \
       -f "$cert_pem_file" \
       -p "$cert_password" \
       --proxy "$proxy" \
       --accept 'application/n-triples' \
       "$query_doc"
     )
 
-    popd > /dev/null
-
     query=$(echo "$query_ntriples" | sed -rn "s/<${query_doc//\//\\/}> <http:\/\/xmlns.com\/foaf\/0.1\/primaryTopic> <(.*)> \./\1/p" | head -1)
 fi
 
-file_doc=$(./create-file.sh \
+file_doc=$(create-file.sh \
   -b "$base" \
   -f "$cert_pem_file" \
   -p "$cert_password" \
@@ -180,22 +176,18 @@ file_doc=$(./create-file.sh \
   --file-content-type "$file_content_type"
 )
 
-pushd . > /dev/null && cd "$SCRIPT_ROOT"
-
-file_ntriples=$(./get.sh \
+file_ntriples=$(get.sh \
   -f "$cert_pem_file" \
   -p "$cert_password" \
   --proxy "$proxy" \
   --accept 'application/n-triples' \
   "$file_doc"
 )
 
-popd > /dev/null
-
 file=$(echo "$file_ntriples" | sed -rn "s/<${file_doc//\//\\/}> <http:\/\/xmlns.com\/foaf\/0.1\/primaryTopic> <(.*)> \./\1/p" | head -1)
 
 if [ -n "$query" ] ; then
-    ./create-rdf-import.sh \
+    create-rdf-import.sh \
       -b "$base" \
       -f "$cert_pem_file" \
       -p "$cert_password" \
@@ -205,7 +197,7 @@ if [ -n "$query" ] ; then
       --query "$query" \
       --file "$file"
 else
-    ./create-rdf-import.sh \
+    create-rdf-import.sh \
       -b "$base" \
       -f "$cert_pem_file" \
       -p "$cert_password" \

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

@@ -16,27 +16,21 @@ curl -k -w "%{http_code}\n" -o /dev/null -s \
   "$END_USER_BASE_URL" \
 | grep -q "$STATUS_FORBIDDEN"
 
-pushd . > /dev/null && cd "$SCRIPT_ROOT"
-
 # create container
 
 slug="test"
 
-container=$(./create-container.sh \
+container=$(create-container.sh \
   -f "$OWNER_CERT_FILE" \
   -p "$OWNER_CERT_PWD" \
   -b "$END_USER_BASE_URL" \
   --title "Test" \
   --slug "$slug" \
   --parent "$END_USER_BASE_URL")
 
-popd > /dev/null
-
-pushd . > /dev/null && cd "$SCRIPT_ROOT/admin/acl"
-
 # create authorization
 
-./create-authorization.sh \
+create-authorization.sh \
   -f "$OWNER_CERT_FILE" \
   -p "$OWNER_CERT_PWD" \
   -b "$ADMIN_BASE_URL" \
@@ -45,8 +39,6 @@ pushd . > /dev/null && cd "$SCRIPT_ROOT/admin/acl"
   --to "$container" \
   --write
 
-popd > /dev/null
-
 # access is allowed after authorization is created
 
 curl -k -w "%{http_code}\n" -o /dev/null -f -s \

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

@@ -16,27 +16,21 @@ curl -k -w "%{http_code}\n" -o /dev/null -s \
   "$END_USER_BASE_URL" \
 | grep -q "$STATUS_FORBIDDEN"
 
-pushd . > /dev/null && cd "$SCRIPT_ROOT"
-
 # create container
 
 slug="test"
 
-container=$(./create-container.sh \
+container=$(create-container.sh \
   -f "$OWNER_CERT_FILE" \
   -p "$OWNER_CERT_PWD" \
   -b "$END_USER_BASE_URL" \
   --title "Test" \
   --slug "$slug" \
   --parent "$END_USER_BASE_URL")
 
-popd > /dev/null
-
-pushd . > /dev/null && cd "$SCRIPT_ROOT/admin/acl"
-
 # create authorization
 
-./create-authorization.sh \
+create-authorization.sh \
   -f "$OWNER_CERT_FILE" \
   -p "$OWNER_CERT_PWD" \
   -b "$ADMIN_BASE_URL" \
@@ -45,8 +39,6 @@ pushd . > /dev/null && cd "$SCRIPT_ROOT/admin/acl"
   --to-all-in "https://www.w3.org/ns/ldt/document-hierarchy#Container" \
   --write
 
-popd > /dev/null
-
 # access is allowed after authorization is created
 
 curl -k -w "%{http_code}\n" -o /dev/null -f -s \