From e4fd769ecc6addcc11f39acb53178803bf9f8858 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Thu, 5 Oct 2017 13:13:41 +0100
Subject: [PATCH] Upgrade to high sierra (#135)

* Upgrade to high sierra

* install gnupg separately

* new iTerm

* Fix tests

* add a script to fixup xcode tools locally if needed
---
 fedora/test_insider                       |  2 +-
 macosx/com.googlecode.iterm2.plist        | 42 ++++++++++++++++++++---
 macosx/install-remaining-interactively.sh |  2 ++
 macosx/up.sh                              |  7 ++--
 4 files changed, 44 insertions(+), 9 deletions(-)
 create mode 100644 macosx/install-remaining-interactively.sh

diff --git a/fedora/test_insider b/fedora/test_insider
index 10f7a79f..83f44171 100755
--- a/fedora/test_insider
+++ b/fedora/test_insider
@@ -13,5 +13,5 @@ cd $HOME
 mkdir -p dev/
 cp -rv temp/dotfiles dev/
 
-./dev/dotfiles/fedora/configure_fresh_system.sh
+./dev/dotfiles/fedora/up.sh
 
diff --git a/macosx/com.googlecode.iterm2.plist b/macosx/com.googlecode.iterm2.plist
index 32635dc6..6d65c78e 100644
--- a/macosx/com.googlecode.iterm2.plist
+++ b/macosx/com.googlecode.iterm2.plist
@@ -8,6 +8,8 @@
 	<integer>0</integer>
 	<key>AppleSmoothFixedFontsSizeThreshold</key>
 	<integer>1</integer>
+	<key>AppleWindowTabbingMode</key>
+	<string>manual</string>
 	<key>Custom Color Presets</key>
 	<dict>
 		<key>3024 Day</key>
@@ -38884,6 +38886,8 @@
 	<string>742D3518-E836-426B-AC64-52464FE2F7EB</string>
 	<key>DimOnlyText</key>
 	<false/>
+	<key>HotkeyMigratedFromSingleToMulti</key>
+	<true/>
 	<key>LoadPrefsFromCustomFolder</key>
 	<true/>
 	<key>NSNavLastRootDirectory</key>
@@ -38931,11 +38935,11 @@
 	<key>NSWindow Frame ProfilesPanel</key>
 	<string>275 596 735 382 0 0 1680 1027 </string>
 	<key>NSWindow Frame SUUpdateAlert</key>
-	<string>330 304 620 392 0 0 1280 777 </string>
+	<string>530 493 620 392 0 0 1680 1027 </string>
 	<key>NSWindow Frame SharedPreferences</key>
 	<string>695 473 796 473 0 0 1680 1027 </string>
 	<key>NSWindow Frame iTerm Window 0</key>
-	<string>0 82 1674 945 0 0 1680 1027 </string>
+	<string>0 80 1680 947 0 0 1680 1027 </string>
 	<key>NSWindow Frame iTerm Window 1</key>
 	<string>0 82 1674 945 0 0 1680 1027 </string>
 	<key>New Bookmarks</key>
@@ -39598,7 +39602,7 @@
 	<key>NoSyncInstallationId</key>
 	<string>41369974-18FD-4FD2-96AB-0C842E6ADF09</string>
 	<key>NoSyncLastTipTime</key>
-	<real>524926762.21642798</real>
+	<real>528131032.32350498</real>
 	<key>NoSyncNeverRemindPrefsChangesLostForFile</key>
 	<true/>
 	<key>NoSyncNeverRemindPrefsChangesLostForFile_selection</key>
@@ -39649,6 +39653,32 @@
 		<string>0036</string>
 		<string>0037</string>
 		<string>0038</string>
+		<string>0039</string>
+		<string>0040</string>
+		<string>0041</string>
+		<string>0042</string>
+		<string>0043</string>
+		<string>0044</string>
+		<string>0045</string>
+		<string>0046</string>
+		<string>0047</string>
+		<string>0048</string>
+		<string>0049</string>
+		<string>0050</string>
+		<string>0051</string>
+		<string>0052</string>
+		<string>0053</string>
+		<string>0054</string>
+		<string>0055</string>
+		<string>0056</string>
+		<string>0057</string>
+		<string>0058</string>
+		<string>0059</string>
+		<string>0060</string>
+		<string>0061</string>
+		<string>0062</string>
+		<string>0063</string>
+		<string>0064</string>
 	</array>
 	<key>PasteTabToStringTabStopSize</key>
 	<integer>4</integer>
@@ -39687,6 +39717,8 @@
 	</dict>
 	<key>PrefsCustomFolder</key>
 	<string>/Users/cyplo/dev/dotfiles/macosx</string>
+	<key>SUAutomaticallyUpdate</key>
+	<true/>
 	<key>SUEnableAutomaticChecks</key>
 	<true/>
 	<key>SUFeedAlternateAppNameKey</key>
@@ -39696,7 +39728,7 @@
 	<key>SUHasLaunchedBefore</key>
 	<true/>
 	<key>SULastCheckTime</key>
-	<date>2017-08-20T12:59:24Z</date>
+	<date>2017-09-26T15:42:42Z</date>
 	<key>SUSendProfileInfo</key>
 	<false/>
 	<key>SavePasteHistory</key>
@@ -39706,7 +39738,7 @@
 	<key>WordCharacters</key>
 	<string>/-+\~_.</string>
 	<key>iTerm Version</key>
-	<string>3.0.15</string>
+	<string>3.1.2</string>
 	<key>kCPKSelectionViewPreferredModeKey</key>
 	<integer>6</integer>
 	<key>kCPKSelectionViewShowHSBTextFieldsKey</key>
diff --git a/macosx/install-remaining-interactively.sh b/macosx/install-remaining-interactively.sh
new file mode 100644
index 00000000..716665ce
--- /dev/null
+++ b/macosx/install-remaining-interactively.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+xcode-select --install
diff --git a/macosx/up.sh b/macosx/up.sh
index a7d46b1e..0ee09df1 100755
--- a/macosx/up.sh
+++ b/macosx/up.sh
@@ -16,11 +16,13 @@ brew unlink gpg-agent
 brew uninstall gpg-agent
 set -e
 
-brew install --force gnupg2
 brew update
 brew upgrade
 brew cask list | xargs brew cask install --force
 
+brew install --force gnupg2
+brew install reattach-to-user-namespace --with-wrap-pbcopy-and-pbpaste
+
 brew install aria2
 brew install \
   autojump \
@@ -28,7 +30,6 @@ brew install \
   mobile-shell \
   the_silver_searcher \
   tmux \
-  reattach-to-user-namespace --with-wrap-pbcopy-and-pbpaste \
   tree \
   watch \
   zsh
@@ -80,7 +81,7 @@ brew cask install appcode
 brew cask install adium
 brew cask install kdiff3
 
-brew services start syncthing
+reattach-to-user-namespace brew services restart syncthing
 
 if ! fgrep /usr/local/bin/zsh /etc/shells; then
   sudo bash -c "echo /usr/local/bin/zsh >> /etc/shells"