src/file/file_merge.sh

@@ -54,27 +54,15 @@ file_merge_tree() {
         return 0
       elif [ "$strategy" -eq 1 ]; then
         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
       elif [ "$strategy" -eq 2 ]; then
         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
       elif [ "$strategy" -eq 3 ]; then
         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
       else
         log user 'Invalid choice'

src/package/package_manager.sh

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

tori

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