ceres-sees-all/caelestia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

install: fix blocking input

Browse source 
Fixes #193
Fixes #186
Fixes #177
This commit is contained in:
2 * r + 2 * t 2025-10-15 22:34:21 +11:00
parent 72f7da9b83
commit ddc6948d31
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
install.fish
View file

@ -44,6 +44,10 @@ function input -a text
_out blue $text $argv[2..] _out blue $text $argv[2..]
end end
function sh-read
sh -c 'read a && echo -n "$a"' || exit 1
end
function confirm-overwrite -a path function confirm-overwrite -a path
if test -e $path -o -L $path if test -e $path -o -L $path
# No prompt if noconfirm # No prompt if noconfirm
@ -53,7 +57,8 @@ function confirm-overwrite -a path
rm -rf $path rm -rf $path
else else
# Prompt user # Prompt user
read -l -p "input '$path already exists. Overwrite? [Y/n] ' -n" confirm || exit 1 input "$path already exists. Overwrite? [Y/n] " -n
set -l confirm (sh-read)
if test "$confirm" = 'n' -o "$confirm" = 'N' if test "$confirm" = 'n' -o "$confirm" = 'N'
log 'Skipping...' log 'Skipping...'
@ -92,14 +97,16 @@ log 'Before continuing, please ensure you have made a backup of your config dire
# Prompt for backup # Prompt for backup
if ! set -q _flag_noconfirm if ! set -q _flag_noconfirm
log '[1] Two steps ahead of you! [2] Make one for me please!' log '[1] Two steps ahead of you! [2] Make one for me please!'
read -l -p "input '=> ' -n" choice || exit 1 input '=> ' -n
set -l choice (sh-read)
if contains -- "$choice" 1 2 if contains -- "$choice" 1 2
if test $choice = 2 if test $choice = 2
log "Backing up $config..." log "Backing up $config..."
if test -e $config.bak -o -L $config.bak if test -e $config.bak -o -L $config.bak
read -l -p "input 'Backup already exists. Overwrite? [Y/n] ' -n" overwrite || exit 1 input 'Backup already exists. Overwrite? [Y/n] ' -n
set -l overwrite (sh-read)
if test "$overwrite" = 'n' -o "$overwrite" = 'N' if test "$overwrite" = 'n' -o "$overwrite" = 'N'
log 'Skipping...' log 'Skipping...'
@ -132,7 +139,7 @@ if ! pacman -Q $aur_helper &> /dev/null
rm -rf $aur_helper rm -rf $aur_helper
# Setup # Setup
if $aur_helper = yay if test $aur_helper = yay
$aur_helper -Y --gendb $aur_helper -Y --gendb
$aur_helper -Y --devel --save $aur_helper -Y --devel --save
else else