From ba650e3b422cddb460a6b4fc20043d61ea8f327b Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 17 Nov 2014 05:14:42 +0100
Subject: ssh-co-dotfiles: re-pull with updated cert

---
 ssh-co-dotfiles | 45 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/ssh-co-dotfiles b/ssh-co-dotfiles
index a6d4b69..1f25160 100755
--- a/ssh-co-dotfiles
+++ b/ssh-co-dotfiles
@@ -12,7 +12,7 @@ h="$1"
 #echo "Expect svn cert fingerprint to be"
 #echo " 66:ab:46:50:ce:21:a5:4a:36:8c:82:0e:77:81:34:d5:53:10:d0:99"
 echo
-ssh "$h" '(! [ -e .dotfiles ] || ( [ -e .dotfiles/.svn ] && mv .dotfiles .dotfiles-svn ) ) &&
+ssh "$h" 'if ! [ -e .dotfiles ] || ( [ -e .dotfiles/.svn ] && mv .dotfiles .dotfiles-svn ); then
 	rm -rf .dotfiles.new &&
 	cat > .www.palfrader.org.crt << EOF &&
 -----BEGIN CERTIFICATE-----
@@ -54,5 +54,46 @@ EOF
 	cd .dotfiles &&
 	git config --local --add http.sslCAinfo "$HOME"/.dotfiles/.certs/www.palfrader.org.crt &&
 	./Link-Them &&
-	echo "All done"'
+	echo "All done";
+  elif [ -e .dotfiles/.git ]; then
+	cat > .www.palfrader.org.crt << EOF &&
+-----BEGIN CERTIFICATE-----
+MIIFejCCBGKgAwIBAgIQToSxUkJRuXHq6GShiZ6UmTANBgkqhkiG9w0BAQsFADBf
+MQswCQYDVQQGEwJGUjEOMAwGA1UECBMFUGFyaXMxDjAMBgNVBAcTBVBhcmlzMQ4w
+DAYDVQQKEwVHYW5kaTEgMB4GA1UEAxMXR2FuZGkgU3RhbmRhcmQgU1NMIENBIDIw
+HhcNMTQwNjIzMDAwMDAwWhcNMTYwNjIzMjM1OTU5WjBcMSEwHwYDVQQLExhEb21h
+aW4gQ29udHJvbCBWYWxpZGF0ZWQxGzAZBgNVBAsTEkdhbmRpIFN0YW5kYXJkIFNT
+TDEaMBgGA1UEAxMRd3d3LnBhbGZyYWRlci5vcmcwggGiMA0GCSqGSIb3DQEBAQUA
+A4IBjwAwggGKAoIBgQC8oPtzgAShwDQxpqeuA/mdiBd4mwA+vCsvrQD058zO7ttQ
+O+XKsUZ6Bv6BSitMLJiGrn45fcwkn1meXDgYf65EyFw6LJXT7EFs6axtqkvpV4fl
+VI7oWwG720l2fThHO/Z7iMNuorPxJcM39zzt5GtEHKMq1dP+YWn6OF0mi7cbGu95
+0PT2ueuO1hF0TAWCK5LuRf3vwKqbhBL0EMwcMqpG7h5WxcxdX3tRIlwG8OoDGw/u
+1v4WCyU1KY4qGmtWvuW5+jzHR5gkIgYJzhBcwpQPqzGrHm7c8cjBV5S6b8XvyGMQ
+0SrEe6ex8kip/Wuh8aAg5iXK3+EJIadAGvGoBxZcO6hiQNoUDRjw8qbq813sPpks
+kosGvQsxbi+0Rqp3Xw67JaKAXZdnbDY9Gj3XqMrISXeKvFTUKsSx1B6qu71asI8T
+bLDYN1O/n9L7c8jH/XpF9uhbKkv2oP6ld05LAInNhTyaJuPwEeZRpIB6yOnYU3b7
+URv3j6+4QbGEq27IMg0CAwEAAaOCAbMwggGvMB8GA1UdIwQYMBaAFLOQp9jJr07N
+YTyffK1df0H9aTDqMB0GA1UdDgQWBBSIvCKT3k4/gqibe5ZL4mI7ILI3vTAOBgNV
+HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
+KwYBBQUHAwIwSwYDVR0gBEQwQjA2BgsrBgEEAbIxAQICGjAnMCUGCCsGAQUFBwIB
+FhlodHRwczovL2Nwcy51c2VydHJ1c3QuY29tMAgGBmeBDAECATBBBgNVHR8EOjA4
+MDagNKAyhjBodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vR2FuZGlTdGFuZGFyZFNT
+TENBMi5jcmwwcwYIKwYBBQUHAQEEZzBlMDwGCCsGAQUFBzAChjBodHRwOi8vY3J0
+LnVzZXJ0cnVzdC5jb20vR2FuZGlTdGFuZGFyZFNTTENBMi5jcnQwJQYIKwYBBQUH
+MAGGGWh0dHA6Ly9vY3NwLnVzZXJ0cnVzdC5jb20wKwYDVR0RBCQwIoIRd3d3LnBh
+bGZyYWRlci5vcmeCDXBhbGZyYWRlci5vcmcwDQYJKoZIhvcNAQELBQADggEBADyo
+L/7Y2yOjAjEknZfHv56xPKmHztkeP4N1X1fwW63sq8ZfPtXTyF7qZHzUjN3Bg+xB
+0n6+ojl9H013QUnGc9lPcwDkGCt63bcm+WoHn7dllmvkEifHckZHk4QQup4Ni5Jw
+HE05gWdJDIxVT3VnnD9UtLN+WpzksPnNZ81HfRQJp34yGkNTd52n5lo8zmygg/96
+kXY3rh7gASx9qm2F7fc92igqDW8CbGY4sn0kOVxb4CzpiNfMUcYOC7JZRcZQynlP
+8YzlHdn+y5s1ykBpEHujhGK306SB2Z1k444mLwIk3/RLGuLMOBEeh7DE3RHE/qJK
+T/fNb04E4tA6QTx905A=
+-----END CERTIFICATE-----
+EOF
+	cd .dotfiles &&
+	git -c http.sslCAinfo="$HOME"/.www.palfrader.org.crt pull &&
+	rm -f .www.palfrader.org.crt &&
+	echo "Pulled with current cert.";
+	fi
+	'
 
-- 
cgit v1.2.3