Updated variable names from all caps to camel case
This commit is contained in:
16
pre-inst.sh
16
pre-inst.sh
@@ -9,7 +9,7 @@ printf \
|
|||||||
cat << EOF
|
cat << EOF
|
||||||
#######################################
|
#######################################
|
||||||
## ##
|
## ##
|
||||||
## $(cat "${BASEDIR}/title") Script ##
|
## $(cat "${baseDir}/title") Script ##
|
||||||
## ##
|
## ##
|
||||||
## Jean <jean@easthighnerd.net> ##
|
## Jean <jean@easthighnerd.net> ##
|
||||||
## ##
|
## ##
|
||||||
@@ -28,7 +28,7 @@ EOF
|
|||||||
source \
|
source \
|
||||||
/etc/os-release
|
/etc/os-release
|
||||||
source \
|
source \
|
||||||
"${BASEDIR}/system.conf"
|
"${baseDir}/system.conf"
|
||||||
|
|
||||||
|
|
||||||
if [[ "${ID}" == 'debian' ]]; then
|
if [[ "${ID}" == 'debian' ]]; then
|
||||||
@@ -77,7 +77,7 @@ elif [[ "${ID}" == 'fedora' ]]; then
|
|||||||
|
|
||||||
dnf install \
|
dnf install \
|
||||||
-y \
|
-y \
|
||||||
https://zfsonlinux.org/fedora/zfs-release-${ZOL_FEDORA_VER}$(rpm --eval "%{dist}").noarch.rpm
|
https://zfsonlinux.org/fedora/zfs-release-${zolFedoraVer}$(rpm --eval "%{dist}").noarch.rpm
|
||||||
|
|
||||||
dnf install \
|
dnf install \
|
||||||
-y \
|
-y \
|
||||||
@@ -101,11 +101,11 @@ if [[ ! "$(hostname)" == "debian-live" ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
"${BASEDIR}/partition.sh"
|
"${baseDir}/partition.sh"
|
||||||
|
|
||||||
sleep 5
|
sleep 5
|
||||||
|
|
||||||
"${BASEDIR}/mkfs.zfs.sh"
|
"${baseDir}/zfs.sh"
|
||||||
|
|
||||||
mkdir \
|
mkdir \
|
||||||
-p \
|
-p \
|
||||||
@@ -128,10 +128,10 @@ elif [[ "${ID}" == 'debian' ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
printf \
|
printf \
|
||||||
"${HOSTNAME}\n" | tee /mnt/etc/hostname &> /dev/null
|
"${hostname}\n" | tee /mnt/etc/hostname &> /dev/null
|
||||||
|
|
||||||
printf \
|
printf \
|
||||||
"127.0.1.1\t${HOSTNAME}\n" | tee --append /mnt/etc/hosts &> /dev/null
|
"127.0.1.1\t${hostname}\n" | tee --append /mnt/etc/hosts &> /dev/null
|
||||||
|
|
||||||
if [[ "${ID}" == 'debian' ]]; then
|
if [[ "${ID}" == 'debian' ]]; then
|
||||||
"${BASEDIR}/base-debian.sh" -2
|
"${BASEDIR}/base-debian.sh" -2
|
||||||
@@ -191,7 +191,7 @@ printf \
|
|||||||
|
|
||||||
chroot \
|
chroot \
|
||||||
/mnt \
|
/mnt \
|
||||||
"$(printf "${BASEDIR}\n" | sed 's|.*\/|\/|')/install.sh"
|
"$(printf "${baseDir}\n" | sed 's|.*\/|\/|')/install.sh"
|
||||||
|
|
||||||
mount | grep -v zfs | tac | awk '/\/mnt/ {print $3}' | xargs -I {} umount -Rlf {}
|
mount | grep -v zfs | tac | awk '/\/mnt/ {print $3}' | xargs -I {} umount -Rlf {}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user