fix: rename internal plugin repository functions (#1537)

asdf-vm · Apr 12, 2023 · 5367f1f · 5367f1f
1 parent 491ef2a
commit 5367f1f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/lib/commands/command-plugin-list-all.bash b/lib/commands/command-plugin-list-all.bash
@@ -1,7 +1,7 @@
 # -*- sh -*-
 
 plugin_list_all_command() {
-  initialize_or_update_repository
+  initialize_or_update_plugin_repository
 
   local plugins_index_path
   plugins_index_path="$(asdf_data_dir)/repository/plugins"

diff --git a/lib/functions/plugins.bash b/lib/functions/plugins.bash
@@ -63,7 +63,7 @@ plugin_add_command() {
   if [ -n "$2" ]; then
     local source_url=$2
   else
-    initialize_or_update_repository
+    initialize_or_update_plugin_repository
     local source_url
     source_url=$(get_plugin_source_url "$plugin_name")
   fi

diff --git a/lib/utils.bash b/lib/utils.bash
@@ -50,7 +50,7 @@ asdf_dir() {
   fi
 }
 
-asdf_repository_url() {
+asdf_plugin_repository_url() {
   printf "https://github.com/asdf-vm/asdf-plugins.git\n"
 }
 
@@ -418,7 +418,7 @@ repository_needs_update() {
   [ "$sync_required" ]
 }
 
-initialize_or_update_repository() {
+initialize_or_update_plugin_repository() {
   local repository_url
   local repository_path
 
@@ -428,15 +428,16 @@ initialize_or_update_repository() {
     exit 1
   fi
 
-  repository_url=$(asdf_repository_url)
+  repository_url=$(asdf_plugin_repository_url)
   repository_path=$(asdf_data_dir)/repository
 
   if [ ! -d "$repository_path" ]; then
     printf "initializing plugin repository..."
     git clone "$repository_url" "$repository_path"
   elif repository_needs_update; then
     printf "updating plugin repository..."
-    (cd "$repository_path" && git fetch && git reset --hard origin/master)
+    git -C "$repository_path" fetch
+    git -C "$repository_path" reset --hard origin/master
   fi
 
   mkdir -p "$(asdf_data_dir)/tmp"