Merge pull request #48 from matyasselmeci/pr/per-key-cache

Name the cache dir after the primary key
osg-htc · Oct 3, 2023 · d23f69f · d23f69f
2 parents 8bd1927 + 30ff243
commit d23f69f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/bin/new_mashfile.sh b/bin/new_mashfile.sh
@@ -76,7 +76,11 @@ esac
 if [[ $REPO == development || \
       $TAG  == *contrib* || \
       $TAG  == *empty* ]]; then
-    KEYS="$auto_key $developer_key"
+    if [[ $developer_key == "$auto_key" ]]; then
+        KEYS=$auto_key
+    else
+        KEYS="$auto_key $developer_key"
+    fi
 else
     KEYS=$developer_key
 fi
@@ -88,7 +92,7 @@ esac
 
 TEMPLATEDIR=/usr/share/repo
 
-KEYSDIR=$(tr -c '0-9A-Za-z' '_' <<<"$KEYS")
+KEYSDIR=$(echo -n "$KEYS" | tr -c '0-9A-Za-z' '_')
 
 sed "
   s/{YUMREPO}/$TAG/