WIP

diff --git a/src/main/resources/import-in-hugo.sh b/src/main/resources/import-in-hugo.sh
index 89124c2422118abc663a29d04ddbac8bffd7154f..5c745f99d92ecd76c220c05d2737d6b0a3dcfeb1 100644 (file)
--- a/src/main/resources/import-in-hugo.sh
+++ b/src/main/resources/import-in-hugo.sh
@@ -180,8 +180,8 @@ do
   then
     TITLE=$(echo "$JSON" | jq -r .project)
     URL="/"
-    mkdir -p "$HUGO_ROOT/content$BASE"
-    TARGET="$HUGO_ROOT/content$BASE/_index.html"
+    mkdir -p "$HUGO_ROOT/content$PATH_BASE"
+    TARGET="$HUGO_ROOT/content$PATH_BASE/_index.html"
   else
     TITLE=$(echo "$PAGE" | jq -r .name)
     URL="/$FILE"
@@ -193,11 +193,11 @@ do
     fi
     if [ "$NUM_CHILDS" -gt 0 ]
     then
-      mkdir -p "$HUGO_ROOT/content$BASE$URL_PATH${FILE%.html}"
-      TARGET="$HUGO_ROOT/content$BASE$URL_PATH${FILE%.html}/_index.html"
+      mkdir -p "$HUGO_ROOT/content$PATH_BASE$URL_PATH${FILE%.html}"
+      TARGET="$HUGO_ROOT/content$PATH_BASE$URL_PATH${FILE%.html}/_index.html"
     else
-      mkdir -p "$HUGO_ROOT/content$BASE$URL_PATH"
-      TARGET="$HUGO_ROOT/content$BASE$URL_PATH$FILE"
+      mkdir -p "$HUGO_ROOT/content$PATH_BASE$URL_PATH"
+      TARGET="$HUGO_ROOT/content$PATH_BASE$URL_PATH$FILE"
     fi
   fi
   echo "Generating page $TARGET"
@@ -210,7 +210,7 @@ do
   then
     echo "url: $CANONICAL$URL" >> $TARGET
   else
-    echo "url: $BASE$URL" >> $TARGET
+    echo "url: $URL_BASE$URL" >> $TARGET
   fi
   echo "layout: article" >> $TARGET
   echo "params:" >> $TARGET
@@ -228,20 +228,20 @@ do
   | perl -0777 -MHTML::Entities -pe 's#<pre\b[^>]*>(.*?)</pre>#"{{< highlight guess >}}\n".decode_entities($1)."\n{{< /highlight >}}"#gse' >> "$TARGET"
 done
 
-mkdir -p "$HUGO_ROOT/static$BASE"
+mkdir -p "$HUGO_ROOT/static$URL_BASE"
 for i in $(find "$SCRIPT_DIR" -maxdepth 1 -mindepth 1 -type d)
 do
   DIR=$(basename $i $SCRIPT_DIR)
   echo "Copying additionally static content from $DIR"
-  cp -av "$i" "$HUGO_ROOT/static$BASE"
+  cp -av "$i" "$HUGO_ROOT/static$URL_BASE"
   PAGE_ENTRY=$(echo "$JSON" | jq '.pages|to_entries[]|select(.value.href|test("^'"$DIR"'/"))')
   if [[ "$PAGE_ENTRY" != "" ]]
   then
     echo "$PAGE_ENTRY" | jq -C .
     PAGE=$(echo "$PAGE_ENTRY" | jq .value)
     URL_PATH=/$(echo "$PAGE" | jq -r .path)
-    TARGET="$HUGO_ROOT/content$BASE$URL_PATH$DIR"
-    mkdir -p "$HUGO_ROOT/content$BASE$URL_PATH$DIR"
+    TARGET="$HUGO_ROOT/content$PATH_BASE$URL_PATH$DIR"
+    mkdir -p "$HUGO_ROOT/content$PATH_BASE$URL_PATH$DIR"
     TARGET="$TARGET/_index.html"
     echo "Generating page $TARGET"
     TITLE=$(echo "$PAGE" | jq -r .name)
@@ -253,7 +253,7 @@ do
     then
       echo "url: $CANONICAL$URL" >> $TARGET
     else
-      echo "url: $BASE$URL" >> $TARGET
+      echo "url: $URL_BASE$URL" >> $TARGET
     fi
     echo "weight: $WEIGHT" >> "$TARGET"
     echo "params:" >> "$TARGET"