From 930d4521ccbb61f089f98d2c9b88c4a834aa3282 Mon Sep 17 00:00:00 2001 From: rlespinasse Date: Wed, 15 Jun 2022 15:51:30 +0200 Subject: [PATCH] Revert "fix(slug_url): remove ending hypen if any" This reverts commit cb3e46ca61b91a1cbf90139405e86af5342276cf. --- .github/workflows/slugify-value.yaml | 2 +- README.md | 1 - slugify.sh | 17 +++++++---------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/slugify-value.yaml b/.github/workflows/slugify-value.yaml index f95704d..af71b44 100644 --- a/.github/workflows/slugify-value.yaml +++ b/.github/workflows/slugify-value.yaml @@ -75,7 +75,7 @@ jobs: with: key: ANOTHER_MAX_LENGTH value: "Never gonna give you up Never gonna let you down" - slug-maxlength: 24 + slug-maxlength: 23 - name: Validate // Slugify with another max length run: | [[ "${{ env.ANOTHER_MAX_LENGTH }}" == "Never gonna give you up Never gonna let you down" ]] diff --git a/README.md b/README.md index 0c18ae2..fa99dd5 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,6 @@ Produce some `slug`-ed environment variables based on the input one. - `_SLUG_URL` (or `_SLUG_URL_CS`) - like `_SLUG` (or `_SLUG_CS`) with the `.`, and `_` characters also replaced by `-` - - will not end with `-` ## Usage diff --git a/slugify.sh b/slugify.sh index c3d1af8..d273694 100755 --- a/slugify.sh +++ b/slugify.sh @@ -33,7 +33,7 @@ slug() { # 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 + reduce "$output" } slug_url() { @@ -42,19 +42,16 @@ slug_url() { # 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 + reduce "$output" } reduce() { - reduced_value="$1" - remove_ending_hypen="$2" - if [ "${MAX_LENGTH}" != "nolimit" ]; then - reduced_value=$(cut -c1-"${MAX_LENGTH}" <<<"$1") + if [ "${MAX_LENGTH}" == "nolimit" ]; then + echo "$1" + else + cut -c1-"${MAX_LENGTH}" <<<"$1" fi - if [ "remove_ending_hypen" == "true" ]; then - reduced_value="${reduced_value//-*$/}" - fi - echo "$reduced_value" +} SLUG_VALUE=$(slug "$VALUE") SLUG_CS_VALUE=$(slug "$CS_VALUE")