install.sh: Join split absolutify functions

Author: mbargull

install-template.sh

@@ -307,30 +307,26 @@ absolutify() {
     local file_path="$1"
     local file_path_dirname="${file_path%/*}"
     local file_path_basename="${file_path##*/}"
-    abs_path_cached "$file_path_dirname"
-    local file_abs_path="$abs_path_cached_retval"
+    local file_abs_path
+    # Update cached abs path only if the argument differs from the last invocation
+    if [ ! "$file_path_dirname" = "${_absolutiy_file_path_dirname-}" ]
+    then
+        _absolutiy_file_path_dirname="$file_path_dirname"
+        # Unset CDPATH because it causes havok: it makes the destination unpredictable
+        # and triggers 'cd' to print the path to stdout. Route `cd`'s output to /dev/null
+        # for good measure.
+        _absolutiy_file_abs_path="$(CDPATH= cd "$file_path_dirname" > /dev/null && pwd)"
+    fi
+    file_abs_path="${_absolutiy_file_abs_path-}"
     local file_path="$file_abs_path/$file_path_basename"
     # This is the return value
     RETVAL="$file_path"
 }
 
 # Prints the absolute path of a directory to stdout
 abs_path() {
-    abs_path_cached "$@"
-    printf %s "$abs_path_cached_retval"
-}
-
-abs_path_cached() {
-    local path="$1"
-    # Update return value only if the argument differs from the last invocation
-    if ! [ "$path" = "${_abs_path_cached_key:-}" ]
-    then
-        _abs_path_cached_key="$path"
-        # Unset CDPATH because it causes havok: it makes the destination unpredictable
-        # and triggers 'cd' to print the path to stdout. Route `cd`'s output to /dev/null
-        # for good measure.
-        abs_path_cached_retval="$(unset CDPATH && cd "$path" > /dev/null && pwd)"
-    fi
+    absolutify "$@"
+    printf %s "$RETVAL"
 }
 
 uninstall_legacy() {