small changes
This commit is contained in:
parent
7bca2c1e94
commit
497f62c438
|
|
@ -48,7 +48,6 @@ cd "$AURHELPER" || exit 0
|
||||||
makepkg -si --noconfirm
|
makepkg -si --noconfirm
|
||||||
cd "$HOME" || exit 0
|
cd "$HOME" || exit 0
|
||||||
|
|
||||||
|
|
||||||
if [[ "$LAYOUT" -eq 1 ]]; then
|
if [[ "$LAYOUT" -eq 1 ]]; then
|
||||||
while IFS= read -r LINE; do
|
while IFS= read -r LINE; do
|
||||||
echo "INSTALLING: $LINE"
|
echo "INSTALLING: $LINE"
|
||||||
|
|
|
||||||
|
|
@ -32,8 +32,8 @@ copy_logs() {
|
||||||
cp "$LOG" "$MOUNTPOINT"/var/log/archtitus.log
|
cp "$LOG" "$MOUNTPOINT"/var/log/archtitus.log
|
||||||
}
|
}
|
||||||
|
|
||||||
do_reboot () {
|
do_reboot() {
|
||||||
if [[ "$LVM" -eq 1 || "$LUKS" -eq 1 ]]; then
|
if [[ "$LVM" -eq "1" || "$LUKS" -eq "1" ]]; then
|
||||||
i=0
|
i=0
|
||||||
while [[ "$i" -le "${#LVM_NAMES[@]}" ]]; do
|
while [[ "$i" -le "${#LVM_NAMES[@]}" ]]; do
|
||||||
umount -l /dev/"$LVM_VG"/"${LVM_NAMES[$i]}"
|
umount -l /dev/"$LVM_VG"/"${LVM_NAMES[$i]}"
|
||||||
|
|
@ -47,7 +47,7 @@ do_reboot () {
|
||||||
end() {
|
end() {
|
||||||
REBOOT="true"
|
REBOOT="true"
|
||||||
copy_logs
|
copy_logs
|
||||||
for (( i = 15; i >= 1; i-- )); do
|
for ((i = 15; i >= 1; i--)); do
|
||||||
read -r -s -n 1 -t 1 -p "Rebooting in $i seconds... Press Esc key to abort or press R key to reboot now."$'\n' KEY
|
read -r -s -n 1 -t 1 -p "Rebooting in $i seconds... Press Esc key to abort or press R key to reboot now."$'\n' KEY
|
||||||
CODE="$?"
|
CODE="$?"
|
||||||
if [ "$CODE" != "0" ]; then
|
if [ "$CODE" != "0" ]; then
|
||||||
|
|
|
||||||
|
|
@ -116,7 +116,7 @@ set_lvm() {
|
||||||
i=2
|
i=2
|
||||||
fi
|
fi
|
||||||
while [[ $i -le "$_PART_NUM" ]]; do
|
while [[ $i -le "$_PART_NUM" ]]; do
|
||||||
if [[ "$_PART_NUM" -eq 1 ]]; then
|
if [[ "$_PART_NUM" -eq "1" ]]; then
|
||||||
read -r -p "Enter last partition name [like home]: " _LVM_NAME
|
read -r -p "Enter last partition name [like home]: " _LVM_NAME
|
||||||
_LVM_NAMES+=("$_LVM_NAME")
|
_LVM_NAMES+=("$_LVM_NAME")
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue