V8.00.000.2025.06.17
All checks were successful
🛡️ Shell Script Linting / 🛡️ Shell Script Linting (push) Successful in 1m38s
All checks were successful
🛡️ Shell Script Linting / 🛡️ Shell Script Linting (push) Successful in 1m38s
Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
@@ -40,6 +40,7 @@ accounts_preparation_ciss() {
|
|||||||
|
|
||||||
install -m 0600 -o root -g root "${VAR_SETUP_PATH}/includes/target/etc/skel/.ciss.bashrc" "${var_target}/etc/skel/.bashrc"
|
install -m 0600 -o root -g root "${VAR_SETUP_PATH}/includes/target/etc/skel/.ciss.bashrc" "${var_target}/etc/skel/.bashrc"
|
||||||
install -m 0600 -o root -g root "${VAR_SETUP_PATH}/includes/target/etc/skel/.ciss.zshrc" "${var_target}/etc/skel/.zshrc"
|
install -m 0600 -o root -g root "${VAR_SETUP_PATH}/includes/target/etc/skel/.ciss.zshrc" "${var_target}/etc/skel/.zshrc"
|
||||||
|
install -m 0600 -o root -g root "${VAR_SETUP_PATH}/includes/target/etc/skel/.zshenv" "${var_target}/etc/skel/.zshenv"
|
||||||
install -m 0600 -o root -g root "${VAR_SETUP_PATH}/includes/target/etc/skel/.ciss/theme_eza_ciss.yml" "${var_target}/etc/skel/.ciss/"
|
install -m 0600 -o root -g root "${VAR_SETUP_PATH}/includes/target/etc/skel/.ciss/theme_eza_ciss.yml" "${var_target}/etc/skel/.ciss/"
|
||||||
install -m 0600 -o root -g root "${VAR_SETUP_PATH}/includes/target/etc/skel/.ciss/alias" "${var_target}/etc/skel/.ciss/"
|
install -m 0600 -o root -g root "${VAR_SETUP_PATH}/includes/target/etc/skel/.ciss/alias" "${var_target}/etc/skel/.ciss/"
|
||||||
install -m 0700 -o root -g root "${VAR_SETUP_PATH}/includes/target/etc/skel/.ciss/check_chrony.sh" "${var_target}/etc/skel/.ciss/"
|
install -m 0700 -o root -g root "${VAR_SETUP_PATH}/includes/target/etc/skel/.ciss/check_chrony.sh" "${var_target}/etc/skel/.ciss/"
|
||||||
|
|||||||
@@ -60,7 +60,9 @@ accounts_setup_ciss_root() {
|
|||||||
mkdir -p "${var_target}/root/.ciss/cdi/backup/root"
|
mkdir -p "${var_target}/root/.ciss/cdi/backup/root"
|
||||||
mv "${var_target}/root/.zshrc" "${var_target}/root/.ciss/cdi/backup/root/.zshrc.bak"
|
mv "${var_target}/root/.zshrc" "${var_target}/root/.ciss/cdi/backup/root/.zshrc.bak"
|
||||||
install -m 0600 -o root -g root "${VAR_SETUP_PATH}/includes/target/root/.ciss.zshrc" "${var_target}/root/.zshrc"
|
install -m 0600 -o root -g root "${VAR_SETUP_PATH}/includes/target/root/.ciss.zshrc" "${var_target}/root/.zshrc"
|
||||||
|
install -m 0600 -o root -g root "${VAR_SETUP_PATH}/includes/target/root/.zshenv" "${var_target}/root/.zshenv"
|
||||||
insert_comments "${var_target}/root/.zshrc"
|
insert_comments "${var_target}/root/.zshrc"
|
||||||
|
insert_comments "${var_target}/root/.zshenv"
|
||||||
|
|
||||||
chroot_exec "${var_target}" chsh -s "${user_root_shell}" root
|
chroot_exec "${var_target}" chsh -s "${user_root_shell}" root
|
||||||
do_log "info" "file_only" "4520() Shell: '${user_root_shell}' used for: 'root'."
|
do_log "info" "file_only" "4520() Shell: '${user_root_shell}' used for: 'root'."
|
||||||
@@ -116,6 +118,9 @@ accounts_setup_ciss_user() {
|
|||||||
zsh_omz_installer "${var_username}" "${var_target}"
|
zsh_omz_installer "${var_username}" "${var_target}"
|
||||||
mv "${var_target}/home/${var_username}/.zshrc" "${var_target}/home/${var_username}/.zshrc.bak"
|
mv "${var_target}/home/${var_username}/.zshrc" "${var_target}/home/${var_username}/.zshrc.bak"
|
||||||
install -m 0600 -o "${var_uid}" -g "${var_gid}" "${VAR_SETUP_PATH}/includes/target/etc/skel/.ciss.zshrc" "${var_target}/home/${var_username}/.zshrc"
|
install -m 0600 -o "${var_uid}" -g "${var_gid}" "${VAR_SETUP_PATH}/includes/target/etc/skel/.ciss.zshrc" "${var_target}/home/${var_username}/.zshrc"
|
||||||
|
install -m 0600 -o "${var_uid}" -g "${var_gid}" "${VAR_SETUP_PATH}/includes/target/etc/skel/.zshenv" "${var_target}/home/${var_username}/.zshenv"
|
||||||
|
insert_comments "${var_target}/home/${var_username}/.zshrc"
|
||||||
|
insert_comments "${var_target}/home/${var_username}/.zshenv"
|
||||||
|
|
||||||
chroot_exec "${var_target}" chsh -s "${var_shell}" "${var_username}"
|
chroot_exec "${var_target}" chsh -s "${var_shell}" "${var_username}"
|
||||||
do_log "info" "file_only" "4520() Shell: '${var_shell}' used for: '${var_username}'."
|
do_log "info" "file_only" "4520() Shell: '${var_shell}' used for: '${var_username}'."
|
||||||
|
|||||||
@@ -29,16 +29,6 @@ if [ -z "${XDG_RUNTIME_DIR:-}" ] && [ -d "/run/user/$(id -u)" ]; then
|
|||||||
export XDG_RUNTIME_DIR="/run/user/$(id -u)"
|
export XDG_RUNTIME_DIR="/run/user/$(id -u)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
### Create canonical directories idempotently with 0700.
|
|
||||||
#_xdg_umask="$(umask)"
|
|
||||||
#umask 077
|
|
||||||
#[ -d "${XDG_CONFIG_HOME}" ] || install -d -m 0700 -- "${XDG_CONFIG_HOME}"
|
|
||||||
#[ -d "${XDG_DATA_HOME}" ] || install -d -m 0700 -- "${XDG_DATA_HOME}"
|
|
||||||
#[ -d "${XDG_CACHE_HOME}" ] || install -d -m 0700 -- "${XDG_CACHE_HOME}"
|
|
||||||
#[ -d "${XDG_STATE_HOME}" ] || install -d -m 0700 -- "${XDG_STATE_HOME}"
|
|
||||||
#umask "${_xdg_umask}"
|
|
||||||
#unset _xdg_umask
|
|
||||||
|
|
||||||
### Optional migrations (controlled via /'etc/default/ciss-xdg-profile').
|
### Optional migrations (controlled via /'etc/default/ciss-xdg-profile').
|
||||||
[ -f /etc/default/ciss-xdg-profile ] && . /etc/default/ciss-xdg-profile
|
[ -f /etc/default/ciss-xdg-profile ] && . /etc/default/ciss-xdg-profile
|
||||||
|
|
||||||
|
|||||||
32
includes/target/etc/skel/.zshenv
Normal file
32
includes/target/etc/skel/.zshenv
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
# SPDX-Version: 3.0
|
||||||
|
# SPDX-CreationInfo: 2025-10-19; WEIDNER, Marc S.; <msw@coresecret.dev>
|
||||||
|
# SPDX-ExternalRef: GIT https://git.coresecret.dev/msw/CISS.debian.live.builder.git
|
||||||
|
# SPDX-FileContributor: WEIDNER, Marc S.; Centurion Intelligence Consulting Agency
|
||||||
|
# SPDX-FileCopyrightText: 2024-2025; WEIDNER, Marc S.; <msw@coresecret.dev>
|
||||||
|
# SPDX-FileType: SOURCE
|
||||||
|
# SPDX-License-Identifier: EUPL-1.2 OR LicenseRef-CCLA-1.0
|
||||||
|
# SPDX-LicenseComment: This file is part of the CISS.debian.installer.secure framework.
|
||||||
|
# SPDX-PackageName: CISS.debian.live.builder
|
||||||
|
# SPDX-Security-Contact: security@coresecret.eu
|
||||||
|
|
||||||
|
: "${XDG_CONFIG_HOME:=${HOME}/.config}"
|
||||||
|
: "${XDG_CACHE_HOME:=${HOME}/.cache}"
|
||||||
|
: "${XDG_DATA_HOME:=${HOME}/.local/share}"
|
||||||
|
: "${XDG_STATE_HOME:=${HOME}/.local/state}"
|
||||||
|
if [ -z "${XDG_RUNTIME_DIR:-}" ]; then
|
||||||
|
if [ -d "/run/user/$(id -u)" ]; then
|
||||||
|
XDG_RUNTIME_DIR="/run/user/$(id -u)"
|
||||||
|
else
|
||||||
|
XDG_RUNTIME_DIR="/tmp/xdg-runtime-$(id -u)"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
export XDG_CONFIG_HOME XDG_CACHE_HOME XDG_DATA_HOME XDG_STATE_HOME XDG_RUNTIME_DIR
|
||||||
|
|
||||||
|
### Zsh history -> XDG_STATE_HOME (best-effort; zsh might not read /etc/profile)
|
||||||
|
if [ "${ENABLE_XDG_ZSH_HISTORY:-1}" = "1" ] && [ -n "${ZSH_VERSION:-}" ]; then
|
||||||
|
[ -d "${XDG_STATE_HOME}/zsh" ] || install -d -m 0700 -- "${XDG_STATE_HOME}/zsh"
|
||||||
|
export HISTFILE="${XDG_STATE_HOME}/zsh/history"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh
|
||||||
32
includes/target/root/.zshenv
Normal file
32
includes/target/root/.zshenv
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
# SPDX-Version: 3.0
|
||||||
|
# SPDX-CreationInfo: 2025-10-19; WEIDNER, Marc S.; <msw@coresecret.dev>
|
||||||
|
# SPDX-ExternalRef: GIT https://git.coresecret.dev/msw/CISS.debian.live.builder.git
|
||||||
|
# SPDX-FileContributor: WEIDNER, Marc S.; Centurion Intelligence Consulting Agency
|
||||||
|
# SPDX-FileCopyrightText: 2024-2025; WEIDNER, Marc S.; <msw@coresecret.dev>
|
||||||
|
# SPDX-FileType: SOURCE
|
||||||
|
# SPDX-License-Identifier: EUPL-1.2 OR LicenseRef-CCLA-1.0
|
||||||
|
# SPDX-LicenseComment: This file is part of the CISS.debian.installer.secure framework.
|
||||||
|
# SPDX-PackageName: CISS.debian.live.builder
|
||||||
|
# SPDX-Security-Contact: security@coresecret.eu
|
||||||
|
|
||||||
|
: "${XDG_CONFIG_HOME:=${HOME}/.config}"
|
||||||
|
: "${XDG_CACHE_HOME:=${HOME}/.cache}"
|
||||||
|
: "${XDG_DATA_HOME:=${HOME}/.local/share}"
|
||||||
|
: "${XDG_STATE_HOME:=${HOME}/.local/state}"
|
||||||
|
if [ -z "${XDG_RUNTIME_DIR:-}" ]; then
|
||||||
|
if [ -d "/run/user/$(id -u)" ]; then
|
||||||
|
XDG_RUNTIME_DIR="/run/user/$(id -u)"
|
||||||
|
else
|
||||||
|
XDG_RUNTIME_DIR="/tmp/xdg-runtime-$(id -u)"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
export XDG_CONFIG_HOME XDG_CACHE_HOME XDG_DATA_HOME XDG_STATE_HOME XDG_RUNTIME_DIR
|
||||||
|
|
||||||
|
### Zsh history -> XDG_STATE_HOME (best-effort; zsh might not read /etc/profile)
|
||||||
|
if [ "${ENABLE_XDG_ZSH_HISTORY:-1}" = "1" ] && [ -n "${ZSH_VERSION:-}" ]; then
|
||||||
|
[ -d "${XDG_STATE_HOME}/zsh" ] || install -d -m 0700 -- "${XDG_STATE_HOME}/zsh"
|
||||||
|
export HISTFILE="${XDG_STATE_HOME}/zsh/history"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh
|
||||||
Reference in New Issue
Block a user