Merge branch 'master' into feature_install_and_preos
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
This commit is contained in:
commit
72bf86646d
7 changed files with 17 additions and 6 deletions
1
cdist/conf/type/__consul/files/versions/0.5.1/cksum
Normal file
1
cdist/conf/type/__consul/files/versions/0.5.1/cksum
Normal file
|
|
@ -0,0 +1 @@
|
|||
2564582176 18232733 consul
|
||||
1
cdist/conf/type/__consul/files/versions/0.5.1/source
Normal file
1
cdist/conf/type/__consul/files/versions/0.5.1/source
Normal file
|
|
@ -0,0 +1 @@
|
|||
https://dl.bintray.com/mitchellh/consul/0.5.1_linux_amd64.zip
|
||||
|
|
@ -43,7 +43,9 @@ if [ ! -d "$version_dir" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
__staged_file /usr/local/bin/consul \
|
||||
__package unzip
|
||||
|
||||
require="__package/unzip" __staged_file /usr/local/bin/consul \
|
||||
--source "$(cat "$version_dir/source")" \
|
||||
--cksum "$(cat "$version_dir/cksum")" \
|
||||
--fetch-command 'curl -s -L "%s"' \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# 2013-2015 Nico Schottelius (nico-cdist at schottelius.org)
|
||||
# 2015 David Hürlimann (david at ungleich.ch)
|
||||
#
|
||||
# This file is part of cdist.
|
||||
#
|
||||
|
|
@ -29,7 +30,7 @@ case "$os" in
|
|||
# Debian needs a seperate package
|
||||
__package locales --state present
|
||||
;;
|
||||
archlinux|suse|ubuntu)
|
||||
archlinux|suse|ubuntu|centos)
|
||||
:
|
||||
;;
|
||||
*)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# 2015 Steven Armstrong (steven-cdist at armstrong.cc)
|
||||
# 2015 Nico Schottelius (nico-cdist at schottelius.org)
|
||||
#
|
||||
# This file is part of cdist.
|
||||
#
|
||||
|
|
@ -74,7 +75,7 @@ cat << DONE
|
|||
verify_cksum() {
|
||||
cksum_is="\$(cksum "$stage_file" | cut -d' ' -f1,2)"
|
||||
cksum_should="$(cat "$__object/parameter/cksum" | cut -d' ' -f1,2)"
|
||||
if [ "\$cksum_is" == "\$cksum_should" ]; then
|
||||
if [ "\$cksum_is" = "\$cksum_should" ]; then
|
||||
return 0
|
||||
else
|
||||
return 1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue