cloud-init-dev team mailing list archive

[Vitaly Kuznetsov <vkuznets@xxxxxxxxxx>]

Vitaly Kuznetsov has proposed merging ~vkuznets/cloud-init:cloud-init-per-dashes into cloud-init:master.

Commit message:
This is to fix https://bugs.launchpad.net/cloud-init/+bug/1812676

Requested reviews:
  cloud-init commiters (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~vkuznets/cloud-init/+git/cloud-init/+merge/362024
-- 
Your team cloud-init commiters is requested to review the proposed merge of ~vkuznets/cloud-init:cloud-init-per-dashes into cloud-init:master.

diff --git a/tools/cloud-init-per b/tools/cloud-init-per
index 7d6754b..0ce394e 100755
--- a/tools/cloud-init-per
+++ b/tools/cloud-init-per
@@ -38,7 +38,7 @@ fi
 [ "$1" = "-h" -o "$1" = "--help" ] && { Usage ; exit 0; }
 [ $# -ge 3 ] || { Usage 1>&2; exit 1; }
 freq=$1
-name=$2
+name=${2/-/_}
 shift 2;
 
 [ "${name#*/}" = "${name}" ] || fail "name cannot contain a /"
@@ -53,6 +53,10 @@ esac
 [ -d "${sem%/*}" ] || mkdir -p "${sem%/*}" ||
    fail "failed to make directory for ${sem}"
 
+# rename legacy sem files whith dashes in their names
+sem_legacy="${sem/_/-}"
+[ "$sem" != "$sem_legacy" -a -e "$sem_legacy" ] && mv -n "$sem_legacy" "$sem"
+
 [ "$freq" != "always" -a -e "$sem" ] && exit 0
 "$@"
 ret=$?