WIP

diff --git a/src/main/resources/import-in-hugo.sh b/src/main/resources/import-in-hugo.sh
index 5c745f99d92ecd76c220c05d2737d6b0a3dcfeb1..aeb20ac3a53593e5643fdb084f86d74735d52813 100644 (file)
--- a/src/main/resources/import-in-hugo.sh
+++ b/src/main/resources/import-in-hugo.sh
@@ -44,7 +44,7 @@ shift
 PROJECT=""
 CURRENT=0
 ARCHIVED=0
-URL=""
+URL_BASE=""
 CANONICAL=""
 
 command -v jq >/dev/null 2>&1 || { echo "ERROR -- jq is required"; exit 1; }
@@ -85,9 +85,9 @@ while [[ $# -gt 0 ]]; do
       then
         shift
       else
-        URL="${2%%/}"
-        URL="${URL##/}"
-        URL="/$URL"
+        URL_BASE="${2%%/}"
+        URL_BASE="${URL_BASE##/}"
+        URL_BASE="/$URL_BASE"
         shift 2
       fi
       ;;
@@ -97,9 +97,9 @@ while [[ $# -gt 0 ]]; do
       then
         shift
       else
-        URL="${2%%/}"
-        URL="${URL##/}"
-        URL="/$URL"
+        URL_BASE="${2%%/}"
+        URL_BASE="${URL_BASE##/}"
+        URL_BASE="/$URL_BASE"
         shift 2
       fi
       ;;
@@ -147,14 +147,16 @@ then
 fi
 VERSION=$(echo "$JSON" | jq -r '.version')
 
-if [[ -n "$URL" ]]
+PATH_BASE="$BASE/$PROJECT/$VERSION"
+
+if [[ -n "$URL_BASE" ]]
 then
-  URL="${URL%/}"
+  URL_BASE="${URL_BASE%/}"
 else
-  URL="$BASE/$PROJECT"
+  URL_BASE="$BASE/$PROJECT"
   if [[ "$ARCHIVED" -eq 1 ]]
   then
-    URL="$URL/$VERSION"
+    URL_BASE="$URL_BASE/$VERSION"
   fi
 fi
 
@@ -165,8 +167,6 @@ else
   CANONICAL="$BASE/$PROJECT"
 fi
 
-BASE="$BASE/$PROJECT/$VERSION"
-
 for i in $(find "$SCRIPT_DIR" -maxdepth 1 -mindepth 1 -type f -name '*.html')
 do
   SOURCE="$i"
@@ -206,22 +206,11 @@ do
   echo "weight: $(echo "$PAGE_ENTRY" | jq -r .key)" >> $TARGET
   echo "outputs:" >> $TARGET
   echo "  - html" >> $TARGET
-  if [[ "$CURRENT" -eq 1 ]]
-  then
-    echo "url: $CANONICAL$URL" >> $TARGET
-  else
-    echo "url: $URL_BASE$URL" >> $TARGET
-  fi
+  echo "url: $URL_BASE$URL" >> $TARGET
   echo "layout: article" >> $TARGET
   echo "params:" >> $TARGET
-  if [[ "$CURRENT" -eq 1 ]]
-  then
-    echo "  current: true" >> $TARGET
-  fi
-  if [[ "$ARCHIVED" -eq 1 ]]
-  then
-    echo "  canonical: $CANONICAL$URL" >> $TARGET
-  fi
+  echo "  current: $CURRENT" >> $TARGET
+  echo "  canonical: $CANONICAL$URL" >> $TARGET
   echo "---" >> $TARGET
   sed -n '/<script id="sili-json" type="application\/json">/q;p' "$SOURCE" \
   | tail -n +2 \
@@ -249,22 +238,11 @@ do
     HREF=$(echo "$PAGE" | jq -r .href)
     echo "---" > "$TARGET"
     echo "title: $TITLE" >> "$TARGET"
-    if [[ "$CURRENT" -eq 1 ]]
-    then
-      echo "url: $CANONICAL$URL" >> $TARGET
-    else
-      echo "url: $URL_BASE$URL" >> $TARGET
-    fi
+    echo "url: $URL_BASE$URL" >> $TARGET
     echo "weight: $WEIGHT" >> "$TARGET"
     echo "params:" >> "$TARGET"
-    if [[ "$CURRENT" -eq 1 ]]
-    then
-      echo "  current: true" >> "$TARGET"
-    fi
-    if [[ "$ARCHIVED" -eq 1 ]]
-    then
-      echo "  canonical: $CANONICAL$URL" >> "$TARGET"
-    fi
+    echo "  current: $CURRENT" >> "$TARGET"
+    echo "  canonical: $CANONICAL$URL" >> "$TARGET"
     echo "---" >> "$TARGET"
     echo "<script type="text/javascript">window.location.replace('../../$HREF')</script>" >> "$TARGET"
     echo "<noscript><p>JavaScript is deactivated.</p></noscript>" >> "$TARGET"