From f1c7463d0d56dd524cdcde47076d0ca4263eef7d Mon Sep 17 00:00:00 2001
From: Romain Lespinasse <romain.lespinasse@gmail.com>
Date: Thu, 16 Jun 2022 09:55:04 +0200
Subject: [PATCH] fix(slug): remove trailing hypens if any after reduction

---
 .github/workflows/slugify-value.yaml |  4 ++--
 README.md                            |  4 ++--
 slugify.sh                           | 23 +++++++++--------------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/slugify-value.yaml b/.github/workflows/slugify-value.yaml
index 2950fd2..f95704d 100644
--- a/.github/workflows/slugify-value.yaml
+++ b/.github/workflows/slugify-value.yaml
@@ -79,8 +79,8 @@ jobs:
       - name: Validate // Slugify with another max length
         run: |
           [[ "${{ env.ANOTHER_MAX_LENGTH }}" == "Never gonna give you up Never gonna let you down" ]]
-          [[ "${{ env.ANOTHER_MAX_LENGTH_SLUG }}" == "never-gonna-give-you-up-" ]]
-          [[ "${{ env.ANOTHER_MAX_LENGTH_SLUG_CS }}" == "Never-gonna-give-you-up-" ]]
+          [[ "${{ env.ANOTHER_MAX_LENGTH_SLUG }}" == "never-gonna-give-you-up" ]]
+          [[ "${{ env.ANOTHER_MAX_LENGTH_SLUG_CS }}" == "Never-gonna-give-you-up" ]]
           [[ "${{ env.ANOTHER_MAX_LENGTH_SLUG_URL }}" == "never-gonna-give-you-up" ]]
           [[ "${{ env.ANOTHER_MAX_LENGTH_SLUG_URL_CS }}" == "Never-gonna-give-you-up" ]]
         shell: bash
diff --git a/README.md b/README.md
index 0c18ae2..efb328f 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,9 @@ Produce some `slug`-ed environment variables based on the input one.
 
   - put the variable content in lower case
   - replace any character by `-` except `0-9`, `a-z`, `.`, and `_`
-  - remove leading and trailing `-` character
+  - remove leading `-` character
   - limit the string size to 63 characters
+  - remove trailing `-` character
 
 - `<env name>_SLUG_CS`
 
@@ -18,7 +19,6 @@ Produce some `slug`-ed environment variables based on the input one.
 - `<env name>_SLUG_URL` (or `<env name>_SLUG_URL_CS`)
 
   - like `<env name>_SLUG` (or `<env name>_SLUG_CS`) with the `.`, and `_` characters also replaced by `-`
-  - will not end with `-`
 
 ## Usage
 
diff --git a/slugify.sh b/slugify.sh
index f692907..b81d705 100755
--- a/slugify.sh
+++ b/slugify.sh
@@ -30,31 +30,26 @@ fi
 slug() {
   # 1st : Remove refs prefix
   # 2d : Replace unwanted characters
-  # 3d : Remove leading dashes
-  # 4d : Remove trailing dashes
-  output=$(sed -E 's#refs/[^\/]*/##;s/[^a-zA-Z0-9._-]+/-/g;s/^-*//;s/-*$//' <<<"$1")
-  reduce "$output" false
+  # 3d : Remove leading hypens
+  output=$(sed -E 's#refs/[^\/]*/##;s/[^a-zA-Z0-9._-]+/-/g;s/^-*//' <<<"$1")
+  reduce "$output"
 }
 
 slug_url() {
   # 1st : Remove refs prefix
   # 2d : Replace unwanted characters
-  # 3d : Remove leading dashes
-  # 4d : Remove trailing dashes
-  output=$(sed -E 's#refs/[^\/]*/##;s/[^a-zA-Z0-9-]+/-/g;s/^-*//;s/-*$//' <<<"$1")
-  reduce "$output" true
+  # 3d : Remove leading hypens
+  output=$(sed -E 's#refs/[^\/]*/##;s/[^a-zA-Z0-9-]+/-/g;s/^-*//' <<<"$1")
+  reduce "$output"
 }
 
 reduce() {
   reduced_value="$1"
-  remove_ending_hypen="$2"
   if [ "${MAX_LENGTH}" != "nolimit" ]; then
-    reduced_value=$(cut -c1-"${MAX_LENGTH}" <<<"$1")
+    reduced_value=$(cut -c1-"${MAX_LENGTH}" <<<"$reduced_value")
   fi
-  if [ "$remove_ending_hypen" == "true" ]; then
-    reduced_value=$(sed -E 's/-*$//' <<<"$reduced_value")
-  fi
-  echo "$reduced_value"
+  # 1st : Remove trailing hypens
+  sed -E 's/-*$//' <<<"$reduced_value"
 }
 
 SLUG_VALUE=$(slug "$VALUE")