Commit 3ce11228 authored by Emeric Verschuur's avatar Emeric Verschuur

[env-setup/ubuntu] remove moreutils requirement

parent 88a9ee71
......@@ -6,6 +6,10 @@ ubuntu_is_installed() {
return 1
}
sudo_sponge() {
_sudo awk -v o="${1}" '{b=NR>1?b""ORS""$0:$0}END{print b > o}'
}
if [ $(id -u) -eq 0 ]; then
_sudo() {
"$@"
......@@ -59,7 +63,6 @@ fi
_sudo apt-get -y install docker-ce \
gawk \
python-yaml \
moreutils \
jq \
git-lfs
......@@ -92,7 +95,7 @@ jq ". + {
\"bip\": \"$CITBX_DOCKER_BIP\",
\"fixed-cidr\": \"$CITBX_DOCKER_FIXED_CIDR\",
\"dns\": $(bashopts_dump_array "string" "${CITBX_DOCKER_DNS_LIST[@]}")
}" | _sudo sponge /etc/docker/daemon.json
}" | sudo_sponge /etc/docker/daemon.json
# Add user SSL ROOT CA
if [ -d $CITBX_ABS_DIR/ca-certificates ]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment