From 24bf4bb6501d7b46a37481a0db70ff2dac4717a0 Mon Sep 17 00:00:00 2001 From: Jeffrey Paul Date: Tue, 16 Jan 2018 16:20:18 -0600 Subject: [PATCH] updates --- Makefile | 7 +++---- README.md | 0 custompkg/root/etc/skel/Library/profile.d/900.gpg-agent.sh | 2 -- .../etc/skel/Library/user-setup/099.add-python-path.sh | 4 ++++ .../skel/Library/user-setup/100.install-caskroom-apps.sh | 1 + .../skel/Library/user-setup/100.install-homebrew-apps.sh | 1 - 6 files changed, 8 insertions(+), 7 deletions(-) mode change 100644 => 100755 README.md mode change 100644 => 100755 custompkg/root/etc/skel/Library/profile.d/900.gpg-agent.sh create mode 100755 custompkg/root/etc/skel/Library/user-setup/099.add-python-path.sh mode change 100644 => 100755 custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh mode change 100644 => 100755 custompkg/root/etc/skel/Library/user-setup/100.install-homebrew-apps.sh diff --git a/Makefile b/Makefile index 0368450..0eb49b1 100755 --- a/Makefile +++ b/Makefile @@ -37,11 +37,10 @@ $(OUTPUT): prepare custompkg/custom.pkg "$(OSX)" \ /Applications/Xcode.app \ /Applications/AutoDMG.app \ - /Applications/CreateUserPkg.app \ "$(OSX)" \ - $(PWD)/custompkg/custom.pkg \ - $(PWD)/pkgs/*.pkg && \ - cp /tmp/output.dmg $(PWD)/$@ + "$(PWD)"/custompkg/custom.pkg \ + "$(PWD)"/pkgs/*.pkg && \ + cp /tmp/output.dmg "$(PWD)"/$@ clean: rm -f *.dmg /tmp/output.dmg custompkg/*.pkg diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/custompkg/root/etc/skel/Library/profile.d/900.gpg-agent.sh b/custompkg/root/etc/skel/Library/profile.d/900.gpg-agent.sh old mode 100644 new mode 100755 index c8a8fc5..4caa80f --- a/custompkg/root/etc/skel/Library/profile.d/900.gpg-agent.sh +++ b/custompkg/root/etc/skel/Library/profile.d/900.gpg-agent.sh @@ -13,8 +13,6 @@ if [[ ! -e $HOME/.gpg-agent-info ]]; then gpg-agent \ --enable-ssh-support \ --daemon \ - --write-env-file \ - --use-standard-socket \ --pinentry-program $(brew --prefix)/bin/pinentry-mac \ 2>&1 >/dev/null fi diff --git a/custompkg/root/etc/skel/Library/user-setup/099.add-python-path.sh b/custompkg/root/etc/skel/Library/user-setup/099.add-python-path.sh new file mode 100755 index 0000000..4b92648 --- /dev/null +++ b/custompkg/root/etc/skel/Library/user-setup/099.add-python-path.sh @@ -0,0 +1,4 @@ +# adds homebrew python packages dir to python paths + +echo "import site; site.addsitedir(\"$HOME/Library/Homebrew/lib/python2.7/site-packages\")" >> \ + $HOME/Library/Python/2.7/lib/python/site-packages/homebrew.pth diff --git a/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh b/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh old mode 100644 new mode 100755 index 24c669b..c09531f --- a/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh +++ b/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh @@ -21,6 +21,7 @@ CASKS=" google-drive iterm2 keepassx + keybase lastpass little-snitch slack diff --git a/custompkg/root/etc/skel/Library/user-setup/100.install-homebrew-apps.sh b/custompkg/root/etc/skel/Library/user-setup/100.install-homebrew-apps.sh old mode 100644 new mode 100755 index 3790d6d..aef3f9e --- a/custompkg/root/etc/skel/Library/user-setup/100.install-homebrew-apps.sh +++ b/custompkg/root/etc/skel/Library/user-setup/100.install-homebrew-apps.sh @@ -34,7 +34,6 @@ HOMEBREW_PKGS=" homebrew/dupes/rsync irssi jq - keybase lame mobile-shell mtr