Skip to content
This repository has been archived by the owner on Nov 7, 2023. It is now read-only.

Commit

Permalink
remove ssh_config edits from make install since this is now handled b…
Browse files Browse the repository at this point in the history
…y kr pair
  • Loading branch information
Kevin King committed Dec 6, 2017
1 parent 2a9566c commit 5f60919
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,6 @@ endif
$(SUDO) install $(SRCBIN)/krssh $(DSTBIN)
$(SUDO) install $(SRCBIN)/krgpg $(DSTBIN)
$(SUDO) install $(SRCLIB)/kr-pkcs11.so $(DSTLIB)
mkdir -m 700 -p ~/.ssh
touch ~/.ssh/config
chmod 0600 ~/.ssh/config
perl -0777 -ne '/# Added by Kryptonite\nHost \*\n\tPKCS11Provider $(subst /,\/,$(PREFIX))\/lib\/kr-pkcs11.so\n\tProxyCommand $(subst /,\/,$(PREFIX))\/bin\/krssh %h %p\n\tIdentityFile ~\/.ssh\/id_kryptonite\n\tIdentityFile ~\/.ssh\/id_ed25519\n\tIdentityFile ~\/.ssh\/id_rsa\n\tIdentityFile ~\/.ssh\/id_ecdsa\n\tIdentityFile ~\/.ssh\/id_dsa/ || exit(1)' ~/.ssh/config || printf '\n# Added by Kryptonite\nHost *\n\tPKCS11Provider $(PREFIX)/lib/kr-pkcs11.so\n\tProxyCommand $(PREFIX)/bin/krssh %%h %%p\n\tIdentityFile ~/.ssh/id_kryptonite\n\tIdentityFile ~/.ssh/id_ed25519\n\tIdentityFile ~/.ssh/id_rsa\n\tIdentityFile ~/.ssh/id_ecdsa\n\tIdentityFile ~/.ssh/id_dsa' >> ~/.ssh/config

start:
ifeq ($(UNAME_S),Darwin)
Expand All @@ -109,10 +105,9 @@ endif

uninstall:
killall krd
kr uninstall
$(SUDO) rm -f $(DSTBIN)/kr
$(SUDO) rm -f $(DSTBIN)/krd
$(SUDO) rm -f $(DSTBIN)/krssh
$(SUDO) rm -f $(DSTBIN)/krgpg
$(SUDO) rm -f $(DSTLIB)/kr-pkcs11.so
perl -0777 -p -i.kr.bak -e 's/\s*# Added by Kryptonite\nHost \*\n\tPKCS11Provider $(subst /,\/,$(PREFIX))\/lib\/kr-pkcs11.so\n\tProxyCommand $(subst /,\/,$(PREFIX))\/bin\/krssh %h %p\n\tIdentityFile ~\/.ssh\/id_kryptonite\n\tIdentityFile ~\/.ssh\/id_ed25519\n\tIdentityFile ~\/.ssh\/id_rsa\n\tIdentityFile ~\/.ssh\/id_ecdsa\n\tIdentityFile ~\/.ssh\/id_dsa//g' ~/.ssh/config
kr uninstall

0 comments on commit 5f60919

Please sign in to comment.