pushzshconfig 02.10.2016 08:50
This commit is contained in:
parent
451ac93eb2
commit
3a6cf7035e
|
@ -51,7 +51,6 @@ rdp()
|
|||
domain="aec.at"
|
||||
fi
|
||||
|
||||
<<<<<<< HEAD
|
||||
which rdesktop >/dev/null
|
||||
if [ $? -eq 0 ]; then
|
||||
#rdesktop -u $username -p - -d $domain -g 1366x768 $server -k de
|
||||
|
@ -65,10 +64,6 @@ rdp()
|
|||
exit 1
|
||||
fi
|
||||
fi
|
||||
=======
|
||||
#rdesktop -u $username -p - -d $domain -g 1366x768 $server -k de
|
||||
rdesktop -K -u $username -p - -d $domain -g workarea $server -k de -x l
|
||||
>>>>>>> 09c08907e220f0e3c8c0165ce31ac4129581a9d4
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -12,16 +12,12 @@ alias vless="/usr/share/vim/vim73/macros/less.sh"
|
|||
alias publish="python2 -m SimpleHTTPServer"
|
||||
alias push="git push origin master"
|
||||
alias pull="git pull origin master"
|
||||
<<<<<<< HEAD
|
||||
alias dev="ssh -l david 10.9.0.43"
|
||||
alias t="todo.sh"
|
||||
alias vpn="sudo openvpn --writepid /var/run/openvpn --config /home/david/.vpn/david.conf"
|
||||
alias aec="sshuttle -vvr 90.146.8.233 192.168.6.0/24 90.146.8.0/26 10.9.0.0/26 10.12.0.0/16 10.2.0.0/26 192.168.3.0/24 10.12.4.0/22"
|
||||
alias home="sshuttle -vvr stargazer.socialnerds.org:2222 10.1.2.0/24"
|
||||
=======
|
||||
alias home="sshuttle -vvr stargazer.socialnerds.org:2222 10.1.2.0/26"
|
||||
alias aec="sshuttle -vvr 90.146.8.9 90.146.8.0/26"
|
||||
>>>>>>> 09c08907e220f0e3c8c0165ce31ac4129581a9d4
|
||||
alias c="clear"
|
||||
alias bat="acpi && date"
|
||||
alias vn="vim ~/ownCloud/Notes/notes.md"
|
||||
|
|
Reference in New Issue