avoid "install /dev/stdin" (#94)

Author: mmetc

debian/rules

@@ -19,7 +19,7 @@ override_dh_auto_install:
 	install -D "$$BOUNCER" -t "debian/$$PKG/usr/bin/"; \
 	install -D "scripts/_bouncer.sh" -t "debian/$$PKG/usr/lib/$$PKG/"; \
 	install -D "config/$$BOUNCER.yaml" "debian/$$PKG/etc/crowdsec/bouncers/$$BOUNCER.yaml"; \
-	BIN="/usr/bin/$$BOUNCER" CFG="/etc/crowdsec/bouncers" envsubst '$$BIN $$CFG' < "config/$$BOUNCER.service" | install -D /dev/stdin "debian/$$PKG/lib/systemd/system/$$BOUNCER.service"; \
+	BIN="/usr/bin/$$BOUNCER" CFG="/etc/crowdsec/bouncers" envsubst '$$BIN $$CFG' < "config/$$BOUNCER.service" > "debian/$$PKG/lib/systemd/system/$$BOUNCER.service"
 	mkdir -p "debian/$$PKG/usr/lib/$$PKG/lua"; \
 	mkdir -p "debian/$$PKG/usr/share/doc/$$PKG/examples"; \
 	install -D "config/crowdsec.cfg" -t "debian/$$PKG/usr/share/doc/$$PKG/examples/"; \

rpm/SPECS/crowdsec-haproxy-spoa-bouncer.spec

@@ -41,7 +41,8 @@ install -m 600 -D config/%{binary_name}.yaml %{buildroot}/etc/crowdsec/bouncers/
 install -m 600 -D scripts/_bouncer.sh %{buildroot}/usr/lib/%{name}/_bouncer.sh
 install -m 644 -D config/crowdsec.cfg %{buildroot}/%{_docdir}/%{name}/examples/crowdsec.cfg
 install -m 644 -D config/haproxy.cfg %{buildroot}/%{_docdir}/%{name}/examples/haproxy.cfg
-BIN=%{_bindir}/%{binary_name} CFG=/etc/crowdsec/bouncers envsubst '$BIN $CFG' < config/%{binary_name}.service | install -m 0644 -D /dev/stdin %{buildroot}%{_unitdir}/%{binary_name}.service
+mkdir -p %{buildroot}%{_unitdir}
+BIN=%{_bindir}/%{binary_name} CFG=/etc/crowdsec/bouncers envsubst '$BIN $CFG' < config/%{binary_name}.service > %{buildroot}%{_unitdir}/%{binary_name}.service
 install -D lua/crowdsec.lua %{buildroot}/usr/lib/%{name}/lua/crowdsec.lua
 install -D lua/utils.lua %{buildroot}/usr/lib/%{name}/lua/utils.lua
 install -D lua/template.lua %{buildroot}/usr/lib/%{name}/lua/template.lua

scripts/_bouncer.sh

@@ -16,14 +16,14 @@ BOUNCER_PREFIX=$(echo "$BOUNCER" | sed 's/crowdsec-/cs-/g')
 # some environment variables with the functions. It's a matter of
 # readability balance between shorter vs cleaner code.
 
-if [ ! -t 0 ]; then
+if [ -n "${NO_COLOR-}" ] || [ ! -t 1 ]; then
     # terminal is not interactive; no colors
     FG_RED=""
     FG_GREEN=""
     FG_YELLOW=""
     FG_CYAN=""
     RESET=""
-elif tput sgr0 >/dev/null 2>&1; then
+elif [ -n "${TERM-}" ] && tput sgr0 >/dev/null 2>&1; then
     # terminfo
     FG_RED=$(tput setaf 1)
     FG_GREEN=$(tput setaf 2)
@@ -124,9 +124,8 @@ set_config_var_value() {
     fi
 
     before=$(cat "$CONFIG")
-    echo "$before" |
-        env "$varname=$value" envsubst "\$$varname" |
-        install -m 0600 /dev/stdin "$CONFIG"
+    (umask 177 && echo "$before" | \
+        env "$varname=$value" envsubst "\$$varname" >"$CONFIG")
 }
 
 set_api_key() {

scripts/install.sh

@@ -26,8 +26,7 @@ gen_apikey() {
 
 gen_config_file() {
     # shellcheck disable=SC2016
-    API_KEY=${API_KEY} envsubst '$API_KEY' <"./config/$CONFIG_FILE" | \
-        install -D -m 0600 /dev/stdin "$CONFIG"
+    (umask 177 && API_KEY="$API_KEY" envsubst '$API_KEY' <"./config/$CONFIG_FILE" > "$CONFIG")
 }
 
 install_bouncer() {
@@ -41,7 +40,7 @@ install_bouncer() {
     fi
     msg info "Installing $BOUNCER"
     install -v -m 0755 -D "$BIN_PATH" "$BIN_PATH_INSTALLED"
-    install -D -m 0600 "./config/$CONFIG_FILE" "$CONFIG"
+    mkdir -p "$(dirname "$CONFIG")"
     # shellcheck disable=SC2016
     CFG=${CONFIG_DIR} BIN=${BIN_PATH_INSTALLED} envsubst '$CFG $BIN' <"./config/$SERVICE" >"$SYSTEMD_PATH_FILE"
     systemctl daemon-reload