Updated variable names and casing
This commit is contained in:
43
post-inst.sh
43
post-inst.sh
@@ -2,7 +2,12 @@
|
||||
set -euo pipefail
|
||||
|
||||
|
||||
BASEDIR="$(dirname "${0}" | sed "s|^\.|${PWD}|")"
|
||||
baseDir="$(realpath "$(dirname "${0}")")"
|
||||
|
||||
source \
|
||||
/etc/os-release
|
||||
source \
|
||||
"${baseDir}/system.conf"
|
||||
|
||||
|
||||
printf \
|
||||
@@ -11,7 +16,7 @@ printf \
|
||||
cat << EOF
|
||||
#######################################
|
||||
## ##
|
||||
## $(cat "${BASEDIR}/title") Script ##
|
||||
## $(cat "${baseDir}/title") Script ##
|
||||
## ##
|
||||
## Jean <jean@easthighnerd.net> ##
|
||||
## ##
|
||||
@@ -32,41 +37,41 @@ source \
|
||||
/etc/os-release
|
||||
|
||||
source \
|
||||
"${BASEDIR}/system.conf"
|
||||
"${baseDir}/system.conf"
|
||||
|
||||
|
||||
if [[ ! "${*}" = *--no-part* ]]; then
|
||||
# if [[ ! "${*}" = *--no-part* ]]; then
|
||||
zfs create\
|
||||
${HOSTNAME,,}/home/${USERNAME}
|
||||
${hostname,,}/home/${username}
|
||||
|
||||
zfs create\
|
||||
${HOSTNAME,,}/home/${USERNAME}/.config
|
||||
${hostname,,}/home/${username}/.config
|
||||
|
||||
zfs create\
|
||||
-o canmount=off\
|
||||
${HOSTNAME,,}/home/${USERNAME}/.var
|
||||
${hostname,,}/home/${username}/.var
|
||||
|
||||
zfs create\
|
||||
${HOSTNAME,,}/home/${USERNAME}/.var/app
|
||||
${hostname,,}/home/${username}/.var/app
|
||||
|
||||
zfs create\
|
||||
-o canmount=off\
|
||||
${HOSTNAME,,}/home/${USERNAME}/.local
|
||||
${hostname,,}/home/${username}/.local
|
||||
|
||||
zfs create\
|
||||
-o canmount=off\
|
||||
${HOSTNAME,,}/home/${USERNAME}/.local/share
|
||||
${hostname,,}/home/${username}/.local/share
|
||||
|
||||
zfs create\
|
||||
${HOSTNAME,,}/home/${USERNAME}/.local/share/flatpak
|
||||
${hostname,,}/home/${username}/.local/share/flatpak
|
||||
|
||||
printf \
|
||||
'Adding user account...\n'
|
||||
|
||||
adduser ${USERNAME}
|
||||
else
|
||||
adduser --no-create-home ${USERNAME}
|
||||
fi
|
||||
adduser ${username}
|
||||
# else
|
||||
# adduser --no-create-home ${username}
|
||||
# fi
|
||||
|
||||
if [[ "${ID}" == 'fedora' ]]; then
|
||||
printf \
|
||||
@@ -77,7 +82,7 @@ if [[ "${ID}" == 'fedora' ]]; then
|
||||
Enter a password for the new user account:
|
||||
EOF
|
||||
passwd \
|
||||
${USERNAME}
|
||||
${username}
|
||||
|
||||
printf \
|
||||
'\033[?47l'
|
||||
@@ -86,7 +91,7 @@ EOF
|
||||
-a \
|
||||
-G \
|
||||
audio,cdrom,dip,floppy,wheel,video,dialout \
|
||||
${USERNAME}
|
||||
${username}
|
||||
else
|
||||
if [[ -z "$(cat /etc/group | grep 'lpadmin')" ]]; then
|
||||
groupadd --gid 108 lpadmin
|
||||
@@ -96,7 +101,7 @@ else
|
||||
-a \
|
||||
-G \
|
||||
audio,cdrom,dip,floppy,netdev,plugdev,sudo,video,dialout,lpadmin \
|
||||
${USERNAME}
|
||||
${username}
|
||||
fi
|
||||
|
||||
if [[ "${ID}" == 'elementary' ]]; then
|
||||
@@ -217,7 +222,7 @@ fi
|
||||
|
||||
zfs \
|
||||
snapshot \
|
||||
${HOSTNAME,,}/ROOT/${ID}@post-install
|
||||
${hostname,,}/ROOT/${ID}@post-install
|
||||
|
||||
printf \
|
||||
'\033[?47h\033[2J\033[H'
|
||||
|
||||
Reference in New Issue
Block a user