Compare commits
2 commits
a0fdbe0149
...
7b2f1494b9
Author | SHA1 | Date | |
---|---|---|---|
7b2f1494b9 | |||
005638bef4 |
5 changed files with 27 additions and 17 deletions
|
@ -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
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
package_conflict_input_parser() {
|
package_conflict_input_parser() {
|
||||||
local packages="$1"
|
local packages="$1"
|
||||||
local conflict_type="$2"
|
local conflict_type="$2"
|
||||||
local input="$TMP_DIR/package_conflict_input"
|
local input="$TMP_ROOT/package_conflict_input"
|
||||||
local input_choices="$TMP_DIR/package_conflict_input_choices"
|
local input_choices="$TMP_ROOT/package_conflict_input_choices"
|
||||||
local choices=
|
local choices=
|
||||||
local packages_to_install=
|
local packages_to_install=
|
||||||
local packages_to_uninstall=
|
local packages_to_uninstall=
|
||||||
|
|
|
@ -3,18 +3,18 @@ resolve_packages() {
|
||||||
local input_packages=
|
local input_packages=
|
||||||
|
|
||||||
# shellcheck disable=SC2154
|
# shellcheck disable=SC2154
|
||||||
( echo "$system_packages" > "$TMP_DIR/system_packages"
|
( echo "$system_packages" > "$TMP_ROOT/system_packages"
|
||||||
echo "$user_packages" > "$TMP_DIR/user_packages" )
|
echo "$user_packages" > "$TMP_ROOT/user_packages" )
|
||||||
|
|
||||||
local packages_not_on_configuration="$(grep -v -x -f \
|
local packages_not_on_configuration="$(grep -v -x -f \
|
||||||
"$TMP_DIR/user_packages" "$TMP_DIR/system_packages" | xargs)"
|
"$TMP_ROOT/user_packages" "$TMP_ROOT/system_packages" | xargs)"
|
||||||
|
|
||||||
if [ -n "$packages_not_on_configuration" ]; then
|
if [ -n "$packages_not_on_configuration" ]; then
|
||||||
not_on_configuration_dialog "$packages_not_on_configuration"
|
not_on_configuration_dialog "$packages_not_on_configuration"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
local packages_not_installed=$(grep -v -x -f \
|
local packages_not_installed=$(grep -v -x -f \
|
||||||
"$TMP_DIR/system_packages" "$TMP_DIR/user_packages" | xargs)
|
"$TMP_ROOT/system_packages" "$TMP_ROOT/user_packages" | xargs)
|
||||||
|
|
||||||
if [ -n "$packages_not_installed" ]; then
|
if [ -n "$packages_not_installed" ]; then
|
||||||
not_installed_dialog "$packages_not_installed"
|
not_installed_dialog "$packages_not_installed"
|
||||||
|
|
|
@ -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
|
||||||
}
|
}
|
||||||
|
@ -119,12 +124,16 @@ set_opts() {
|
||||||
}
|
}
|
||||||
|
|
||||||
prepare_directories() {
|
prepare_directories() {
|
||||||
if ! [ -d "$TMP_DIR" ]; then
|
if ! [ -d "$TMP_ROOT" ]; then
|
||||||
mkdir "$TMP_DIR"
|
mkdir "$TMP_ROOT"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! [ -d "$CACHE_DIR" ]; then
|
if ! [ -d "$CACHE_ROOT" ]; then
|
||||||
mkdir -p "$CACHE_DIR"
|
mkdir -p "$CACHE_ROOT"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! [ -d "$BACKUP_ROOT" ]; then
|
||||||
|
mkdir -p "$BACKUP_ROOT"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! [ -d "$CONFIG_ROOT" ]; then
|
if ! [ -d "$CONFIG_ROOT" ]; then
|
||||||
|
|
7
tori
7
tori
|
@ -5,8 +5,9 @@ main() {
|
||||||
VERSION="0.5.0 2024-07-18"
|
VERSION="0.5.0 2024-07-18"
|
||||||
TORI_ROOT="$HOME/.local/share/tori"
|
TORI_ROOT="$HOME/.local/share/tori"
|
||||||
CONFIG_ROOT="$HOME/.config/tori"
|
CONFIG_ROOT="$HOME/.config/tori"
|
||||||
TMP_DIR="/tmp/tori"
|
BACKUP_ROOT="$HOME/.local/state/tori/backup"
|
||||||
CACHE_DIR="$HOME/.cache/tori"
|
TMP_ROOT="/tmp/tori"
|
||||||
|
CACHE_ROOT="$HOME/.cache/tori"
|
||||||
|
|
||||||
# os-independent state
|
# os-independent state
|
||||||
|
|
||||||
|
@ -25,7 +26,7 @@ main() {
|
||||||
|
|
||||||
## os-dependent state
|
## os-dependent state
|
||||||
OS="$(get_operating_system)"
|
OS="$(get_operating_system)"
|
||||||
PACKAGE_CACHE="$CACHE_DIR/${OS}_packages.cache"
|
PACKAGE_CACHE="$CACHE_ROOT/${OS}_packages.cache"
|
||||||
|
|
||||||
base_files=
|
base_files=
|
||||||
bkp_files=
|
bkp_files=
|
||||||
|
|
Loading…
Reference in a new issue