From 82f48ef27116ed458c7fc10d864292e843ddef0a Mon Sep 17 00:00:00 2001 From: Antoine Catton Date: Sat, 27 Dec 2014 20:11:14 -0700 Subject: [PATCH] DRY: Remove default parameter value handeling in __apt_source --- cdist/conf/type/__cdistmarker/gencode-remote | 12 ++---------- .../type/__cdistmarker/parameter/default/destination | 1 + .../conf/type/__cdistmarker/parameter/default/format | 1 + 3 files changed, 4 insertions(+), 10 deletions(-) create mode 100644 cdist/conf/type/__cdistmarker/parameter/default/destination create mode 100644 cdist/conf/type/__cdistmarker/parameter/default/format diff --git a/cdist/conf/type/__cdistmarker/gencode-remote b/cdist/conf/type/__cdistmarker/gencode-remote index e332df38..92ea582b 100755 --- a/cdist/conf/type/__cdistmarker/gencode-remote +++ b/cdist/conf/type/__cdistmarker/gencode-remote @@ -19,19 +19,11 @@ # # The marker file is established in the docs, but it isn't obligatory. -if [ -f "$__object/parameter/destination" ]; then - destination="$(cat "$__object/parameter/destination")" -else - destination='/etc/cdist-configured' -fi +destination="$(cat "$__object/parameter/destination")" # The basic output of date is usually good enough, but variety is the # spice of life... -if [ -f "$__object/parameter/format" ]; then - format="$(cat "$__object/parameter/format")" -else - format='-u' -fi +format="$(cat "$__object/parameter/format")" # Dump the timestamp in UTC to the marker echo "date $format > $destination" diff --git a/cdist/conf/type/__cdistmarker/parameter/default/destination b/cdist/conf/type/__cdistmarker/parameter/default/destination new file mode 100644 index 00000000..bd3a112f --- /dev/null +++ b/cdist/conf/type/__cdistmarker/parameter/default/destination @@ -0,0 +1 @@ +/etc/cdist-configured diff --git a/cdist/conf/type/__cdistmarker/parameter/default/format b/cdist/conf/type/__cdistmarker/parameter/default/format new file mode 100644 index 00000000..5dc9e6ec --- /dev/null +++ b/cdist/conf/type/__cdistmarker/parameter/default/format @@ -0,0 +1 @@ +-u