From 2e480180c50139e696c87f88f1b15da446b796aa Mon Sep 17 00:00:00 2001 From: Andrew DeFaria Date: Tue, 4 Jan 2022 13:34:54 -0800 Subject: [PATCH] Fixed bug with aliasing less when not installed --- rc/bash_login | 2 +- rc/gitignore | 1 - rc/sshconfig | 33 +++++++++++++++++++-------------- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/rc/bash_login b/rc/bash_login index c0cf08f..4cfce77 100644 --- a/rc/bash_login +++ b/rc/bash_login @@ -248,7 +248,7 @@ if [ "$TERM" = "hpterm" -o \ fi # Miscellaneous: -if [ -x $(type -p less) ]; then +if type -p less > /dev/null; then export LESS=eiXP"?f%f :[stdin] .?pt(%pt\%):?bt(%bt bytes):-.." alias more="less -sr" export PAGER="less -sr" diff --git a/rc/gitignore b/rc/gitignore index ec446f5..f4a5bc1 100644 --- a/rc/gitignore +++ b/rc/gitignore @@ -1,4 +1,3 @@ -.gitignore .project .pydevproject .includepath diff --git a/rc/sshconfig b/rc/sshconfig index 0cda956..ea4e2f9 100644 --- a/rc/sshconfig +++ b/rc/sshconfig @@ -1,13 +1,28 @@ StrictHostKeyChecking no LogLevel ERROR -Host jupiter cpanel github.com sandbox sandboxal +Host 10.2.* sandbox* + ForwardAgent yes + StrictHostKeyChecking no + UserKnownHostsFile /dev/null + AddKeysToAgent yes + IdentitiesOnly yes + ForwardX11 yes + ForwardX11Trusted yes + User root + +Host 192.168.0.* mars earth defaria.com home + ForwardX11 yes + ForwardX11Trusted yes + +Host jupiter cpanel github.com ForwardX11 no ForwardX11Trusted no Host jupiter Port 2222 +# Macbook Host cpanel User andrewdefaria @@ -23,22 +38,12 @@ Host sandboxal Hostname 10.2.99.106 IdentityFile ~/.ssh/cpanelkey -Host sandbox - Hostname 10.2.99.60 - IdentityFile ~/.ssh/cpanelkey - Host enterprise.cpanel.net IdentityFile ~/.ssh/cpanelkey -Host 10.2.* sandbox* - ForwardAgent yes - StrictHostKeyChecking no - UserKnownHostsFile /dev/null - AddKeysToAgent yes - IdentitiesOnly yes - ForwardX11 no - ForwardX11Trusted no - User root +Host sandbox + Hostname 10.2.99.60 + IdentityFile ~/.ssh/cpanelkey Host * ServerAliveInterval 300 -- 2.17.1