Skip to content

Instantly share code, notes, and snippets.

@n8felton
Last active October 10, 2019 13:35
Show Gist options
  • Save n8felton/dc6e3900786f5b1c5cc186edafc6aed2 to your computer and use it in GitHub Desktop.
Save n8felton/dc6e3900786f5b1c5cc186edafc6aed2 to your computer and use it in GitHub Desktop.
RECIPE_SEARCH_DIRS with RECIPE_REPO_DIR default
diff --git a/Code/autopkg b/Code/autopkg
index d0747bc..e9db986 100755
--- a/Code/autopkg
+++ b/Code/autopkg
@@ -200,6 +200,7 @@ def find_recipe_by_name(name, search_dirs):
patterns = [
os.path.join(normalized_dir, "%s.recipe" % name),
os.path.join(normalized_dir, "*/%s.recipe" % name),
+ os.path.join(normalized_dir, "*/*/%s.recipe" % name),
]
for pattern in patterns:
matches = glob.glob(pattern)
diff --git a/Code/autopkglib/__init__.py b/Code/autopkglib/__init__.py
index f2652fe..4a0b59e 100755
--- a/Code/autopkglib/__init__.py
+++ b/Code/autopkglib/__init__.py
@@ -309,6 +309,7 @@ def find_recipe_by_identifier(identifier, search_dirs):
patterns = [
os.path.join(normalized_dir, "*.recipe"),
os.path.join(normalized_dir, "*/*.recipe"),
+ os.path.join(normalized_dir, "*/*/*.recipe"),
]
for pattern in patterns:
matches = glob.glob(pattern)
$ defaults read com.github.autopkg
{
"CACHE_DIR" = "/Volumes/Data/AutoPkg/Cache";
"RECIPE_OVERRIDE_DIRS" = "/Volumes/Data/AutoPkg/RecipeOverrides";
"RECIPE_REPO_DIR" = "/Volumes/Data/AutoPkg/RecipeRepos";
"RECIPE_SEARCH_DIRS" = (
"/Volumes/Data/AutoPkg/RecipeRepos"
);
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment