diff --git a/pkg/de-p1st-installer/PKGBUILD b/pkg/de-p1st-installer/PKGBUILD index d0434b1..bd47d3b 100644 --- a/pkg/de-p1st-installer/PKGBUILD +++ b/pkg/de-p1st-installer/PKGBUILD @@ -2,7 +2,7 @@ _pkgname=installer _reponame=arch pkgname="de-p1st-$_pkgname" -pkgver=0.1.18 +pkgver=0.1.19 pkgrel=1 pkgdesc="Bash script to install Arch Linux" arch=('any') diff --git a/pkg/de-p1st-installer/de-p1st-installer.sh b/pkg/de-p1st-installer/de-p1st-installer.sh index fea7356..173ac3b 100755 --- a/pkg/de-p1st-installer/de-p1st-installer.sh +++ b/pkg/de-p1st-installer/de-p1st-installer.sh @@ -139,6 +139,7 @@ function get_user_input() { if [ -z "${USER_PWD}" ]; then ask_user_if_empty USER_PWD 'Enter a user password:' || return $? ask_user_if_empty USER_PWD2 'Please enter the password again:' || return $? + # shellcheck disable=SC2153 [[ "${USER_PWD}" == "${USER_PWD2}" ]] || { echo 'Passwords did not match'; exit 1; @@ -147,6 +148,7 @@ function get_user_input() { if [ -z "${LUKS_PWD}" ]; then ask_user_if_empty LUKS_PWD 'Enter a disk encryption password:' || return $? ask_user_if_empty LUKS_PWD2 'Please enter the password again:' || return $? + # shellcheck disable=SC2153 [[ "${LUKS_PWD}" == "${LUKS_PWD2}" ]] || { echo 'Passwords did not match'; exit 1; @@ -247,9 +249,9 @@ function mount_partitions() { sudo umount -R /mnt || return $? echo 'Mounting @ and @home subvolumes with options: '"${FS_MOUNT_OPTIONS}" - sudo mount -o 'subvol=@'"${FS_MOUNT_OPTIONS}" "${DATA_PART}" /mnt || return $? + sudo mount -o 'subvol=@,'"${FS_MOUNT_OPTIONS}" "${DATA_PART}" /mnt || return $? sudo mkdir /mnt/home || return $? - sudo mount -o 'subvol=@home'"${FS_MOUNT_OPTIONS}" "${DATA_PART}" /mnt/home || return $? + sudo mount -o 'subvol=@home,'"${FS_MOUNT_OPTIONS}" "${DATA_PART}" /mnt/home || return $? ;; *) echo 'BTRFS subvolume layout '"${FS_BTRFS_SUBVOL_LAYOUT}"' not supported!' diff --git a/pkg/de-p1st-installer/example-vbox.cfg b/pkg/de-p1st-installer/example-vbox.cfg index 89eca99..c5ee62f 100644 --- a/pkg/de-p1st-installer/example-vbox.cfg +++ b/pkg/de-p1st-installer/example-vbox.cfg @@ -13,7 +13,7 @@ LUKS_PWD='test' # If unset, then USER_PWD will be used for ROOT_PWD # ROOT_PWD=test -TARGET_BLOCK_DEVICE='/dev/sda' +TARGET_BLOCK_DEVICE='/dev/sda' # /dev/vda for Virtual Machine Manager BOOT_PART_SIZE='500' # MiB FS='BTRFS' FS_BTRFS_SUBVOL_LAYOUT='@root@home' # Subvolume layout that is supported by Timeshift