From d048656c0d21dcbb4d2fd97fb8b6f9185cbba4e5 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 12 Jan 2023 19:42:40 +0100 Subject: [PATCH] filesystem: move MAYBE_FIRST_START out of the post-install scripts The main reason we have the first install warning still is that we fill $HOME with bash related scripts that will only get executed on the next login shell. Simplify things by keeping MAYBE_FIRST_START logic in one file and make it depend on wether $HOME was missing at the beginning. --- filesystem/07-pacman-key.post | 2 -- filesystem/PKGBUILD | 4 ++-- filesystem/profile | 4 ++++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/filesystem/07-pacman-key.post b/filesystem/07-pacman-key.post index 2dd155ad..c89f993e 100644 --- a/filesystem/07-pacman-key.post +++ b/filesystem/07-pacman-key.post @@ -7,8 +7,6 @@ maybe_init_keyring () /usr/bin/pacman-key --populate msys2 || true /usr/bin/pacman-key --refresh-keys || true /usr/bin/gpgconf --kill all - - MAYBE_FIRST_START=true fi } diff --git a/filesystem/PKGBUILD b/filesystem/PKGBUILD index 28ff40b6..8ef73ef3 100644 --- a/filesystem/PKGBUILD +++ b/filesystem/PKGBUILD @@ -69,7 +69,7 @@ sha256sums=('742a7d66b7a5ebd2b8461728c5b44a46b2305fd2116208eecae5f45828938ea0' '22c0d481c7717eee7be0b29c69df15f65d39f16e4af50ad21919bd59259896d1' '5f7aa3a776dbdaae78a27e608bf004bf50d5aaace2c2b03581d940b771bc8582' '91f1f918cf13deab0124082086e990786113b0e710dbda4678d8fc14905ad94d' - '62e6c515d98c8bf609c77dcbae4efa940f1397c2e47dbc342fb6fe5139bd11f2' + '90d42690cd460a102dacbdfc9b68c3f4c71260f48c9a18b7f8da4eca3d26dbee' '6c0ca979c7b146b3750103b1296a399764f4e1b222ee091d3aa072b6da16c1a5' 'cbec90c9403826bf6d8dd1fed16240b9d8695ec15df5dcdab7e485bb46c016ab' '1b5adfbee606fc68c4fbba5d8caded4f463bd5eed9438cf2c560129d42ba4346' @@ -80,7 +80,7 @@ sha256sums=('742a7d66b7a5ebd2b8461728c5b44a46b2305fd2116208eecae5f45828938ea0' 'd7b7eb4cd9e1f9bc227b009cdcacf700f5523ccc109fbd3c1c0331726d314c9e' '9c126262051a047450ed97397ee89a7148098c03ae00a1cd67c3f3425d8e4b12' '549859e17dc0b8d5c0374103c8a1afc6995bc61ce8f1423eeed51dc9e6cc74e0' - '574564607e5ea8d877f42d59c164801e3efa4393a0a74c0714d9b9a778dec43f' + '19badd8d5d7e0052028c466fc1eb7fcf8f7e1fb50cb832be389922047897ef3e' 'caf25e3390331c6a22cc91f1c1bc551a9f87c59171dd3ef7b3b6016859a10fb5' '28c42ec8a6888e63b2156a802d93e74b544eff211ec688fb6ce8e67e12b81156' '26bf8d1acade9431d60c035a7ddfa9cb0775d5b9a457c5aca56f51c5f2f93f98' diff --git a/filesystem/profile b/filesystem/profile index 438b7ec1..598c61fe 100644 --- a/filesystem/profile +++ b/filesystem/profile @@ -65,6 +65,10 @@ esac CONFIG_SITE="/etc/config.site" MAYBE_FIRST_START=false +if [ ! -d "${HOME}" ]; then + MAYBE_FIRST_START=true +fi + SYSCONFDIR="${SYSCONFDIR:=/etc}" # TMP and TEMP as defined in the Windows environment must be kept