Compare commits

...

2 commits

3 changed files with 20 additions and 9 deletions

View file

@ -54,15 +54,27 @@ file_merge_tree() {
return 0 return 0
elif [ "$strategy" -eq 1 ]; then elif [ "$strategy" -eq 1 ]; then
backup_paths "$absolute_path" backup_paths "$absolute_path"
if [ -r "$config_path" ] && [ -w "$absolute_path" ]; then
cp -vi "$config_path" "$absolute_path" cp -vi "$config_path" "$absolute_path"
else
$AUTHORIZE_COMMAND cp -vi "$config_path" "$absolute_path"
fi
return 1 return 1
elif [ "$strategy" -eq 2 ]; then elif [ "$strategy" -eq 2 ]; then
backup_paths "$config_path" backup_paths "$config_path"
if [ -r "$absolute_path" ] && [ -w "$config_path" ]; then
cp -vi "$absolute_path" "$config_path" cp -vi "$absolute_path" "$config_path"
else
$AUTHORIZE_COMMAND cp -vi "$absolute_path" "$config_path"
fi
return 1 return 1
elif [ "$strategy" -eq 3 ]; then elif [ "$strategy" -eq 3 ]; then
echo "< $(tildify "$absolute_path") | $(echo "$config_path" | sed "s*$CONFIG_ROOT/**") >" echo "< $(tildify "$absolute_path") | $(echo "$config_path" | sed "s*$CONFIG_ROOT/**") >"
if [ -r "$absolute_path" ] && [ -r "$config_path" ]; then
diff "$absolute_path" "$config_path" diff "$absolute_path" "$config_path"
else
$AUTHORIZE_COMMAND diff "$absolute_path" "$config_path"
fi
return 1 return 1
else else
log user 'Invalid choice' log user 'Invalid choice'

View file

@ -2,7 +2,6 @@ package_manager() {
local command="$1" local command="$1"
local manager local manager
local authorizer="sudo"
local args__install local args__install
local args__uninstall local args__uninstall
local args__get_manually_installed local args__get_manually_installed
@ -25,11 +24,11 @@ package_manager() {
if [ "$command" = 'get_manually_installed' ]; then if [ "$command" = 'get_manually_installed' ]; then
eval $manager "$args__get_manually_installed" eval $manager "$args__get_manually_installed"
elif [ "$command" = 'install' ]; then elif [ "$command" = 'install' ]; then
$authorizer $manager $args__install $args__user_args $AUTHORIZE_COMMAND $manager $args__install $args__user_args
elif [ "$command" = 'uninstall' ]; then elif [ "$command" = 'uninstall' ]; then
$authorizer $manager $args__uninstall $args__user_args $AUTHORIZE_COMMAND $manager $args__uninstall $args__user_args
elif [ "$command" = 'update' ]; then elif [ "$command" = 'update' ]; then
$authorizer $manager $args__update $AUTHORIZE_COMMAND $manager $args__update
elif [ "$command" = 'get_available' ]; then elif [ "$command" = 'get_available' ]; then
eval $manager "$args__get_available" eval $manager "$args__get_available"
else else

4
tori
View file

@ -19,14 +19,14 @@ main() {
parameter="$2" parameter="$2"
# import source # import source
check_core_paths check_core_paths
. "$TORI_ROOT/src/index.sh" . "$TORI_ROOT/src/index.sh"
set_opts on
## os-dependent state ## os-dependent state
set_opts on
OS="$(get_operating_system)" OS="$(get_operating_system)"
PACKAGE_CACHE="$CACHE_ROOT/${OS}_packages.cache" PACKAGE_CACHE="$CACHE_ROOT/${OS}_packages.cache"
AUTHORIZE_COMMAND="sudo"
base_files= base_files=
bkp_files= bkp_files=