jutty/tori
1
1
Fork 0
Code Issues Pull requests Releases 1 Activity

Tree file management strategy and file backups #3

Merged
jutty merged 13 commits from file-copy into main 2024-09-03 17:14:39 +02:00
Conversation 0 Commits 13 Files changed 12 +9 -4
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 005638bef4 - Show all commits

4
src/file/file_merge.sh
View file

@ -47,8 +47,7 @@ file_merge_tree() {
local prompt_verb="In configuration only" local prompt_verb="In configuration only"
local prompt_options="Copy to system" local prompt_options="Copy to system"
fi fi
strategy="$(ask "$prompt_verb: $(tildify "$absolute_path")" "$prompt_options")" || strategy="$(ask "$prompt_verb: $(tildify "$absolute_path")" "$prompt_options")"
file_merge_tree "$base_files"
log debug "[merge_tree] Chosen strategy: $strategy" log debug "[merge_tree] Chosen strategy: $strategy"
if [ "$strategy" -eq 0 ]; then if [ "$strategy" -eq 0 ]; then
@ -65,6 +64,7 @@ file_merge_tree() {
return 1 return 1
else else
log user 'Invalid choice' log user 'Invalid choice'
return 1
fi fi
fi fi
done done

9
src/utility.sh
View file

@ -76,10 +76,15 @@ ask() {
read -r read_answer read -r read_answer
answer="$(echo "$read_answer" | xargs)" answer="$(echo "$read_answer" | xargs)"
if [ "$answer" -ge 0 ] 2> /dev/null && [ "$answer" -le $options_count ]; then if [ -z "$answer" ]; then
log info "[ask] Invalid choice"
echo -1
return 1
elif [ "$answer" -ge 0 ] 2> /dev/null && [ "$answer" -le $options_count ]; then
echo "$answer" echo "$answer"
else else
log debug "[ask] Invalid choice" log info "[ask] Invalid choice"
echo -1
return 1 return 1
fi fi
} }