1
diff --git a/tools/cloud-init-per b/tools/cloud-init-per
2
index eae3e93..fcd1ea7 100755
3
--- a/tools/cloud-init-per
4
+++ b/tools/cloud-init-per
5
@@ -38,7 +38,7 @@ fi
6
38
[ "$1" = "-h" -o "$1" = "--help" ] && { Usage ; exit 0; }
38
[ "$1" = "-h" -o "$1" = "--help" ] && { Usage ; exit 0; }
7
39
[ $# -ge 3 ] || { Usage 1>&2; exit 1; }
39
[ $# -ge 3 ] || { Usage 1>&2; exit 1; }
8
40
freq=$1
40
freq=$1
10
41
name=${2/-/_}
41
name=$(echo $2 | sed 's/-/_/g')
11
42
shift 2;
42
shift 2;
12
43
43
13
44
[ "${name#*/}" = "${name}" ] || fail "name cannot contain a /"
44
[ "${name#*/}" = "${name}" ] || fail "name cannot contain a /"
14
@@ -56,7 +56,7 @@ esac
15
56
# Rename legacy sem files with dashes in their names. Do not overwrite existing
56
# Rename legacy sem files with dashes in their names. Do not overwrite existing
16
57
# sem files to prevent clobbering those which may have been created from calls
57
# sem files to prevent clobbering those which may have been created from calls
17
58
# outside of cloud-init.
58
# outside of cloud-init.
19
59
sem_legacy="${sem/_/-}"
59
sem_legacy=$(echo $sem | sed 's/_/-/g')
20
60
[ "$sem" != "$sem_legacy" -a -e "$sem_legacy" ] && mv -n "$sem_legacy" "$sem"
60
[ "$sem" != "$sem_legacy" -a -e "$sem_legacy" ] && mv -n "$sem_legacy" "$sem"
21
61
61
22
62
[ "$freq" != "always" -a -e "$sem" ] && exit 0
62
[ "$freq" != "always" -a -e "$sem" ] && exit 0
Reviewer	Review Type	Date Requested	Status
Dan Watkins		2019-03-08	Approve on 2019-03-08
Server Team CI bot	continuous-integration		Approve on 2019-03-08
Review via email: mp+364190@code.launchpad.net
1	diff --git a/tools/cloud-init-per b/tools/cloud-init-per
2	index eae3e93..fcd1ea7 100755
3	--- a/tools/cloud-init-per
4	+++ b/tools/cloud-init-per
5	@@ -38,7 +38,7 @@ fi
6	38	[ "$1" = "-h" -o "$1" = "--help" ] && { Usage ; exit 0; }	38	[ "$1" = "-h" -o "$1" = "--help" ] && { Usage ; exit 0; }
7	39	[ $# -ge 3 ] \|\| { Usage 1>&2; exit 1; }	39	[ $# -ge 3 ] \|\| { Usage 1>&2; exit 1; }
8	40	freq=$1	40	freq=$1
10	41	name=${2/-/_}	41	name=$(echo $2 \| sed 's/-/_/g')
11	42	shift 2;	42	shift 2;
12	43		43
13	44	[ "${name#*/}" = "${name}" ] \|\| fail "name cannot contain a /"	44	[ "${name#*/}" = "${name}" ] \|\| fail "name cannot contain a /"
14	@@ -56,7 +56,7 @@ esac
15	56	# Rename legacy sem files with dashes in their names. Do not overwrite existing	56	# Rename legacy sem files with dashes in their names. Do not overwrite existing
16	57	# sem files to prevent clobbering those which may have been created from calls	57	# sem files to prevent clobbering those which may have been created from calls
17	58	# outside of cloud-init.	58	# outside of cloud-init.
19	59	sem_legacy="${sem/_/-}"	59	sem_legacy=$(echo $sem \| sed 's/_/-/g')
20	60	[ "$sem" != "$sem_legacy" -a -e "$sem_legacy" ] && mv -n "$sem_legacy" "$sem"	60	[ "$sem" != "$sem_legacy" -a -e "$sem_legacy" ] && mv -n "$sem_legacy" "$sem"
21	61		61
22	62	[ "$freq" != "always" -a -e "$sem" ] && exit 0	62	[ "$freq" != "always" -a -e "$sem" ] && exit 0