fixes for upload / download scripts

ist-dresden · Jun 4, 2024 · 8b63bc9 · 8b63bc9
1 parent 2581a69
commit 8b63bc9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/tools/bin/downloadJcrDirectory.sh b/tools/bin/downloadJcrDirectory.sh
@@ -46,6 +46,8 @@ if [ -z "$CPM_ADMINPASSWD" ]; then
 fi
 
 jcrpath="$1"
+jcrpath="${jcrpath#src/main/content/jcr_root/}"
+jcrpath="${jcrpath#src/main/resources/root/}"
 jcrpath="${jcrpath#jcr_root/}"
 jcrpath="${jcrpath#root/}"
 url="${CPM_PROTOCOL}://${CPM_HOST}:${CPM_PORT}/bin/cpm/nodes/source.zip/${jcrpath}"

diff --git a/tools/bin/updateJcrDirectory.sh b/tools/bin/updateJcrDirectory.sh
@@ -51,7 +51,9 @@ while [ $(basename "$rootdir") != "jcr_root" -a $(basename "$rootdir") != "root"
 done
 rootdir=$(dirname $rootdir)
 
-jcrpath="${path#jcr_root/}"
+jcrpath="${path#src/main/content/jcr_root/}"
+jcrpath="${jcrpath#src/main/resources/root/}"
+jcrpath="${jcrpath#jcr_root/}"
 jcrpath="${jcrpath#root/}"
 url="$CPM_PROTOCOL://$CPM_HOST:$CPM_PORT/bin/cpm/nodes/sourceupload.zip/${jcrpath}"