From 03c822ece29f5740fb464e6944aec93159914c92 Mon Sep 17 00:00:00 2001
From: Greg Neagle <gregneagle@mac.com>
Date: Sat, 22 Aug 2020 15:33:38 -0700
Subject: [PATCH] Move pkg scripts into code/tools/pkgresources

---
 code/tools/make_munki_mpkg.sh                             | 8 ++++----
 .../pkgresources}/Scripts_app/postinstall                 | 0
 .../pkgresources}/Scripts_app/preinstall                  | 0
 .../pkgresources}/Scripts_app_usage/postinstall           | 0
 .../pkgresources}/Scripts_app_usage/preinstall            | 0
 .../pkgresources}/Scripts_launchd/postinstall             | 0
 .../pkgresources}/Scripts_python/postinstall              | 0
 7 files changed, 4 insertions(+), 4 deletions(-)
 rename code/{pkgtemplate => tools/pkgresources}/Scripts_app/postinstall (100%)
 rename code/{pkgtemplate => tools/pkgresources}/Scripts_app/preinstall (100%)
 rename code/{pkgtemplate => tools/pkgresources}/Scripts_app_usage/postinstall (100%)
 rename code/{pkgtemplate => tools/pkgresources}/Scripts_app_usage/preinstall (100%)
 rename code/{pkgtemplate => tools/pkgresources}/Scripts_launchd/postinstall (100%)
 rename code/{pkgtemplate => tools/pkgresources}/Scripts_python/postinstall (100%)

diff --git a/code/tools/make_munki_mpkg.sh b/code/tools/make_munki_mpkg.sh
index 7db2a123..1e3b903c 100755
--- a/code/tools/make_munki_mpkg.sh
+++ b/code/tools/make_munki_mpkg.sh
@@ -704,22 +704,22 @@ for pkg in core admin app launchd app_usage python no_python; do
     case $pkg in
         "app")
             ver="$APPSVERSION"
-            SCRIPTS="${MUNKIROOT}/code/pkgtemplate/Scripts_app"
+            SCRIPTS="${MUNKIROOT}/code/tools/pkgresources/Scripts_app"
             ;;
         "launchd")
             ver="$LAUNCHDVERSION"
             SCRIPTS=""
             if [ "$MDMSTYLE" == "YES" ] ; then
-                SCRIPTS="${MUNKIROOT}/code/pkgtemplate/Scripts_launchd"
+                SCRIPTS="${MUNKIROOT}/code/tools/pkgresources/Scripts_launchd"
             fi
             ;;
         "app_usage")
             ver="$VERSION"
-            SCRIPTS="${MUNKIROOT}/code/pkgtemplate/Scripts_app_usage"
+            SCRIPTS="${MUNKIROOT}/code/tools/pkgresources/Scripts_app_usage"
             ;;
         "python")
             ver="$PYTHONVERSION"
-            SCRIPTS="${MUNKIROOT}/code/pkgtemplate/Scripts_python"
+            SCRIPTS="${MUNKIROOT}/code/tools/pkgresources/Scripts_python"
             ;;
         *)
             ver="$VERSION"
diff --git a/code/pkgtemplate/Scripts_app/postinstall b/code/tools/pkgresources/Scripts_app/postinstall
similarity index 100%
rename from code/pkgtemplate/Scripts_app/postinstall
rename to code/tools/pkgresources/Scripts_app/postinstall
diff --git a/code/pkgtemplate/Scripts_app/preinstall b/code/tools/pkgresources/Scripts_app/preinstall
similarity index 100%
rename from code/pkgtemplate/Scripts_app/preinstall
rename to code/tools/pkgresources/Scripts_app/preinstall
diff --git a/code/pkgtemplate/Scripts_app_usage/postinstall b/code/tools/pkgresources/Scripts_app_usage/postinstall
similarity index 100%
rename from code/pkgtemplate/Scripts_app_usage/postinstall
rename to code/tools/pkgresources/Scripts_app_usage/postinstall
diff --git a/code/pkgtemplate/Scripts_app_usage/preinstall b/code/tools/pkgresources/Scripts_app_usage/preinstall
similarity index 100%
rename from code/pkgtemplate/Scripts_app_usage/preinstall
rename to code/tools/pkgresources/Scripts_app_usage/preinstall
diff --git a/code/pkgtemplate/Scripts_launchd/postinstall b/code/tools/pkgresources/Scripts_launchd/postinstall
similarity index 100%
rename from code/pkgtemplate/Scripts_launchd/postinstall
rename to code/tools/pkgresources/Scripts_launchd/postinstall
diff --git a/code/pkgtemplate/Scripts_python/postinstall b/code/tools/pkgresources/Scripts_python/postinstall
similarity index 100%
rename from code/pkgtemplate/Scripts_python/postinstall
rename to code/tools/pkgresources/Scripts_python/postinstall