Set config folder and file to permissions that are compatible with AutoPkgr

Author: tboyko

.github/workflows/pkgbuild.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-
+      
 jobs:
   build:
     runs-on: macos-latest

.gitignore

@@ -1,2 +1,2 @@
 build/
-source/
+src/

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.2.2] - 2020-09-10
+
+### Fixed
+
+- config.plist permissions are now retained during installation
+- config.plist file is no longer overwritten during subsequent installs
+
 ## [1.2.1] - 2020-09-10
 
 ### Changed

README.md

@@ -38,7 +38,9 @@ SIMPLEMDM_API_KEY="Whvop7kWXxsva326ABDF8VDCSGFyEkuEx2xGgj4jab8AE90cn70QdBTq0fpll
 
 #### Configuration File
 
-You may store the key in the configuration file at `/usr/local/simplemdm/munki-plugin/config.plist`. Please scope the permissions on this file so that it is restricted, however still allowing utilities using the repo plugin to access it. 
+You may store the key in the configuration file at `/usr/local/simplemdm/munki-plugin/config.plist`. This file is already present if you installed this plugin using the release package. 
+
+**Note:** Please scope the permissions on this file so that it is restricted, however still allowing utilities using the repo plugin to access it.
 
 The file should be formatted as below. Be sure to provide your own API key:
 
@@ -60,7 +62,7 @@ Any `.munki` recipe is supported. In this case, we are importing `GoogleChrome.m
 **Please Note:** Running MakeCatalogs.munki is not necessary. See "Using Makecatalogs" below for more information.
 
 ```
-autopkg run -v GoogleChrome.munki -k MUNKI_REPO_PLUGIN="SimpleMDMRepo" -k extract_icon=True
+autopkg run -v GoogleChrome.munki -k MUNKI_REPO_PLUGIN="SimpleMDMRepo" -k MUNKI_REPO="" -k extract_icon=True
 ```
 
 ## Using munkiimport and manifestutil

SimpleMDMRepo.py

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 # SimpleMDMRepo.py
-# Version 1.2.1
+# Version 1.2.2
 
 from __future__ import absolute_import, print_function
 

build.sh

@@ -7,19 +7,32 @@ echo "::set-output name=version::${version}"
 project_root="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 build_dir="$project_root/build"
 src_dir="$project_root/src"
+files_dir="$src_dir/files"
 pkg_path="${build_dir}/simplemdm-munki-plugin-${version}.pkg"
 
-rm -rf "$src_dir"
-mkdir "$src_dir"
+rm -rf $src_dir
 
-mkdir -p "$src_dir/usr/local/munki/munkilib/munkirepo"
-cp "$project_root/SimpleMDMRepo.py" "$src_dir/usr/local/munki/munkilib/munkirepo/SimpleMDMRepo.py"
-mkdir -p "$src_dir/usr/local/simplemdm/munki-plugin"
-cp -np "$project_root/config.plist" "$src_dir/usr/local/simplemdm/munki-plugin/config.plist"
+mkdir -p $files_dir/usr/local/munki/munkilib/munkirepo
+cp $project_root/SimpleMDMRepo.py $files_dir/usr/local/munki/munkilib/munkirepo/SimpleMDMRepo.py
 
-rm -rf "$build_dir"
-mkdir "$build_dir"
+mkdir -p $files_dir/usr/local/simplemdm/munki-plugin
+chmod 777 $files_dir/usr/local/simplemdm/munki-plugin
+cp $project_root/config.plist.example $files_dir/usr/local/simplemdm/munki-plugin/config.plist.example
+chmod 666 $files_dir/usr/local/simplemdm/munki-plugin/config.plist.example
 
-pkgbuild --root "$src_dir" --identifier com.simplemdm.munki_plugin --version $version "$pkg_path"
+rm -rf $build_dir
+mkdir $build_dir
 
-rm -rf "$src_dir"
+mkdir $src_dir/scripts
+echo "#!/bin/bash
+cp -np /usr/local/simplemdm/munki-plugin/config.plist.example /usr/local/simplemdm/munki-plugin/config.plist
+exit 0" > $src_dir/scripts/postinstall
+chmod 777 $src_dir/scripts/postinstall
+
+pkgbuild --root $files_dir \
+         --identifier com.simplemdm.munki_plugin \
+         --version $version \
+         --scripts $src_dir/scripts \
+         $pkg_path
+
+rm -rf $src_dir