From 81551b8b4df2492170540d98f0a8eb365d05c4fe Mon Sep 17 00:00:00 2001
From: Valentin Lab <valentin.lab@kalysto.org>
Date: Sun, 10 Sep 2023 11:54:37 +0200
Subject: [PATCH] new: [base] use ``set -eux`` more consistently between
 scripts

---
 precise/base-0k/hooks/install.d/00-base.sh      | 9 ++++++---
 precise/base-0k/hooks/install.d/05-shyaml.sh    | 2 ++
 precise/base-0k/hooks/install.d/30-customize.sh | 5 +++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/precise/base-0k/hooks/install.d/00-base.sh b/precise/base-0k/hooks/install.d/00-base.sh
index 22589c4..9fdc586 100755
--- a/precise/base-0k/hooks/install.d/00-base.sh
+++ b/precise/base-0k/hooks/install.d/00-base.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set +eux
+set -eux
 
 
 ## Certificate DST_Root_CA-X3 expired, it needs to be removed
@@ -89,8 +89,11 @@ apt-get -y install bash-completion wget bzip2 git-core \
         less tmux mosh \
         sudo git vim file gawk </dev/null
 
-apt-get -y python-software-properties </dev/null ||
-    apt-get -y software-properties-common </dev/null
+if ! apt-get -y python-software-properties </dev/null; then
+    if ! apt-get -y software-properties-common </dev/null; then
+        echo "Couldn't install package, but you probably don't need it."
+    fi
+fi
 
 
 type -p lsb_release >/dev/null 2>&1 ||
diff --git a/precise/base-0k/hooks/install.d/05-shyaml.sh b/precise/base-0k/hooks/install.d/05-shyaml.sh
index d0b3563..861d21b 100755
--- a/precise/base-0k/hooks/install.d/05-shyaml.sh
+++ b/precise/base-0k/hooks/install.d/05-shyaml.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -eux
+
 ## For shyaml
 
 case $(lsb_release -is) in
diff --git a/precise/base-0k/hooks/install.d/30-customize.sh b/precise/base-0k/hooks/install.d/30-customize.sh
index ec4d336..33c58a9 100755
--- a/precise/base-0k/hooks/install.d/30-customize.sh
+++ b/precise/base-0k/hooks/install.d/30-customize.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
-## Requires kal-script
+set -eux
 
+## Requires kal-script
 
 ##
 ## More shell configurations (prompt, functions)
@@ -122,7 +123,7 @@ fi
 
 #export FZF_DEFAULT_OPTS="--color 'fg:#bbccdd,fg+:#ddeeff,bg:#111820,preview-bg:#223344,border:#778899'"
 export FZF_DEFAULT_COMMAND='fd --type f --hidden --follow --exclude .git'
-export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
+export FZF_CTRL_T_COMMAND="\$FZF_DEFAULT_COMMAND"
 
 
 EOF