standardize LOGFILE definitions

AlgoCompSynth · Oct 14, 2024 · 5c27a9c · 5c27a9c
1 parent 0f6cbe1
commit 5c27a9c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/CLAMS-devel/1_jammy_distrobox_setup/1_base_packages.sh b/CLAMS-devel/1_jammy_distrobox_setup/1_base_packages.sh
@@ -4,9 +4,13 @@ set -e
 
 ./unminimize.sh
 
+echo "Defining LOGFILE"
+export LOGFILE=$PWD/1_base_packages.log
+rm --force $LOGFILE
+
 echo "Installing base packages"
 export DEBIAN_FRONTEND=noninteractive
-sudo apt-get install --assume-yes \
+/usr/bin/time sudo apt-get install --assume-yes \
   apt-file \
   autoconf \
   automake \
@@ -59,6 +63,6 @@ sudo apt-get install --assume-yes \
   xz-utils \
   wget \
   zsh \
-  > 1_base_packages.log 2>&1
+  >> $LOGFILE 2>&1
 
 echo "Finished"
diff --git a/CLAMS-devel/1_jammy_distrobox_setup/unminimize.sh b/CLAMS-devel/1_jammy_distrobox_setup/unminimize.sh
@@ -2,14 +2,20 @@
 
 set -e
 
+echo "Defining LOGFILE"
+export LOGFILE=$PWD/unminimize.log
+rm --force $LOGFILE
+
 echo "Updating package cache"
 export DEBIAN_FRONTEND=noninteractive
 /usr/bin/time sudo apt-get update \
-  > unminimize.log 2>&1
+  >> $LOGFILE 2>&1
+
 echo "Upgrading packages"
 /usr/bin/time sudo apt-get upgrade --assume-yes \
-  >> unminimize.log 2>&1
+  >> $LOGFILE 2>&1
+
 echo "Restoring missing 'man' pages"
 sudo touch /etc/dpkg/dpkg.cfg.d/excludes
 echo "Y" | /usr/bin/time sudo unminimize \
-  >> unminimize.log 2>&1
+  >> $LOGFILE 2>&1
diff --git a/CLAMS-devel/cforth_platformio/test_board.sh b/CLAMS-devel/cforth_platformio/test_board.sh
@@ -9,7 +9,7 @@ source ../set_pico_envars
 export PIO_ENVIRONMENT=${1-rpipico}
 export BOARD_TAG=${2-""}
 export LOGFILE="$PWD/${PIO_ENVIRONMENT}${BOARD_TAG}.log"
-rm -f $LOGFILE
+rm --force $LOGFILE
 
 echo "Activating PlatformIO virtual environment"
 source $ACTIVATE_PLATFORMIO_VENV