Improve w530 bookworm setup.

diff --git a/bookworm/apt-mark/.user.swp b/bookworm/apt-mark/.user.swp
deleted file mode 100644 (file)
index 29184c9..0000000
Binary files a/bookworm/apt-mark/.user.swp and /dev/null differ

diff --git a/bookworm/home_files/user/mail_sync.sh b/bookworm/home_files/user/mail_sync.sh
index 7d96256fe9bb8a26075511b5a5b154f7bc15b92b..ffe6b4abdf1937aae830904fde93398fb709ad7c 100755 (executable)
--- a/bookworm/home_files/user/mail_sync.sh
+++ b/bookworm/home_files/user/mail_sync.sh
@@ -22,11 +22,8 @@ for tag in $(notmuch search --output=tags '*'); do
     fi
     target_dir="${basedir}"$(echo "${tag}" | cut -c5-)"/cur/"
     for f in $(notmuch search --output=files tag:"${tag}"); do
-        echo DEBUG0 $f
          new_name=$(basename "${f}" | sed -e 's/,U=[0-9]*//')
-        echo DEBUG0 $new_name
          target_path="${target_dir}${new_name}"
-        echo DEBUG0 $target_path
          if [ ! "${target_path}" = "${f}" ]; then
              echo "Moving ${f} to ${target_path}."
              mv "${f}" "${target_path}"

diff --git a/bookworm/setup_scripts/setup_home.sh b/bookworm/setup_scripts/setup_home.sh
index 8a8b26512c1515e26cc4f62b2280e58753bc071c..3dd502ccfb1f4f45cad91362a0f111555bbad078 100755 (executable)
--- a/bookworm/setup_scripts/setup_home.sh
+++ b/bookworm/setup_scripts/setup_home.sh
@@ -94,7 +94,7 @@ if [ -f "${authinfo_file}" ]; then
 fi
 cd
 
-# rm -rf "${dir_secrets}"
+rm -rf "${dir_secrets}"
 
 maildir=~/mail/maildir
 # # Set up e-mail system. Note that we only do mbsync if the imap pass file