diff --git a/rootfs/home/andre/.bashrc b/rootfs/home/andre/.bashrc index 572c93e..3ce6772 100644 --- a/rootfs/home/andre/.bashrc +++ b/rootfs/home/andre/.bashrc @@ -10,17 +10,18 @@ export HISTFILESIZE=20000 export HISTSIZE=5000 export HISTTIMEFORMAT="%F %T " export HISTIGNORE="free*:exit:clear:man*:mc*:history*:set*:export*:alias*:source*:declare*:__*" +export HOMEDIR=/home/andre alias ll='ls -haltr' alias ppm="sudo perl -MCPAN -e 'shell'" alias RDPC='__RDP 10.101.0.236' alias __activate_bashrc='set +o history; source <(curl -k https://tools.andregeissler.de/bashrc) ; set -o history ; history -c' -alias __backup_bashrc='set +o history; scp -P 2222 ~/.bashrc andregeissler@vesta.agserver.de:~/web/tools.andregeissler.de/public_html/bashrc ; set -o history' -alias __restore_bashrc='set +o history; scp -P 2222 andregeissler@vesta.agserver.de:~/web/tools.andregeissler.de/public_html/bashrc ~/.bashrc ; set -o history' +alias __backup_bashrc='set +o history; scp -P 2222 $HOMEDIR/.bashrc andregeissler@vesta.agserver.de:$HOMEDIR/web/tools.andregeissler.de/public_html/bashrc ; set -o history' +alias __restore_bashrc='set +o history; scp -P 2222 andregeissler@vesta.agserver.de:$HOMEDIR/web/tools.andregeissler.de/public_html/bashrc $HOMEDIR/.bashrc ; set -o history' -alias __backup_ssh_host_config='set +o history; scp -P 2222 ~/.ssh/config andregeissler@vesta.agserver.de:~/web/tools.andregeissler.de/public_html/ssh_host_config ; set -o history' -alias __restore_ssh_host_config='set +o history; scp -P 2222 andregeissler@vesta.agserver.de:~/web/tools.andregeissler.de/public_html/ssh_host_config ~/.ssh/config ; set -o history' +alias __backup_ssh_host_config='set +o history; scp -P 2222 $HOMEDIR/.ssh/config andregeissler@vesta.agserver.de:$HOMEDIR/web/tools.andregeissler.de/public_html/ssh_host_config ; set -o history' +alias __restore_ssh_host_config='set +o history; scp -P 2222 andregeissler@vesta.agserver.de:$HOMEDIR/web/tools.andregeissler.de/public_html/ssh_host_config $HOMEDIR/.ssh/config ; set -o history' alias __ssh_host_config=__restore_ssh_host_config alias __ssh_h='egrep "^# " .ssh/config' alias ßh=ssh @@ -33,7 +34,7 @@ alias grep='grep --line-buffered' alias egrep='egrep --line-buffered' if [ -x /usr/bin/dircolors ]; then - test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" + test -r $HOMEDIR/.dircolors && eval "$(dircolors -b $HOMEDIR/.dircolors)" || eval "$(dircolors -b)" export GREP_COLORS='1;37;41' alias ls='ls --color=auto' @@ -51,10 +52,10 @@ export SSHPASS=G0ttAmH3rd export GPGKEY=13FAA6FC export EDITOR=vi -# export PERL_MB_OPT="--install_base \"/home/andre/perl5\"" -# export PERL_MM_OPT="INSTALL_BASE=/home/andre/perl5" +# export PERL_MB_OPT="--install_base \"$HOMEDIR/perl5\"" +# export PERL_MM_OPT="INSTALL_BASE=$HOMEDIR/perl5" export PERL_MM_USE_DEFAULT=1 -export PATH=$PATH:.:~:/install/:/home/andre/scripts/:/home/andre/bin/: +export PATH=$PATH:.:~:/install/:$HOMEDIR/scripts/:$HOMEDIR/bin/: export PROMPT_DIRTRIM=10 color_prompt=yes @@ -102,7 +103,7 @@ __prompt_confirm() { # prompt_confirm "Overwrite File?" || return 0 __my_versions() { - files='~/.bashrc ~/.ssh/config' + files='$HOMEDIR/.bashrc $HOMEDIR/.ssh/config' for file in `echo $files` do cmd="grep '### Version' $file | grep -v grep | tr -d '#'" @@ -182,19 +183,19 @@ ssh_host_config schreibt Verbindungs-Parameter in .ssh/config install_ssh_keypair_files - speichert Schlüsselpaar in ~/.ssh/id_ed25519[.pub] + speichert Schlüsselpaar in $HOMEDIR/.ssh/id_ed25519[.pub] install_ssh_authorized_key [|user] hängt pub-key an [~]|[/home/user]/.ssh/authorized_keys an ssh_env 1. versucht zunächst key basierte anmeldung einzurichten - 2. copy der bash aufs zielsystem ~/.bash_profile + 2. copy der bash aufs zielsystem $HOMEDIR/.bash_profile 3. ssh per key 4. bei erfolg wird beim anmelden die zuvor angelegte datei ausgeführt und durch einen rm am Ende dieses bashrc gelöscht ssh -o \"ProxyJump HOST\" user@server - ssh via JumpHost HOST der kann in ~/.ssh/config vordefiniert werden + ssh via JumpHost HOST der kann in $HOMEDIR/.ssh/config vordefiniert werden " } @@ -328,7 +329,7 @@ AddTimeDateToPicturesMenu () { date > $LOG echo $@ >> $LOG - D=$(perl -e '$s=$ARGV[0];@a=$s=~/([a-z0-9-._\/ ]*?)([a-z0-9-._]*) +\//i; + D=$(perl -e '$s=$ARGV[0];@a=$s=$HOMEDIR/([a-z0-9-._\/ ]*?)([a-z0-9-._]*) +\//i; $s=~s/$a[0]//g; print "$a[0]"; ' "$@") @@ -336,7 +337,7 @@ print "$a[0]"; P=$(pwd) echo "P $P" >> $LOG - F=$(perl -e '$s=$ARGV[0];@a=$s=~/([a-z0-9-._\/ ]*?)([a-z0-9-._]*) +\//i; + F=$(perl -e '$s=$ARGV[0];@a=$s=$HOMEDIR/([a-z0-9-._\/ ]*?)([a-z0-9-._]*) +\//i; $s=~s/$a[0]//g; print "$s"; ' "$@") @@ -884,8 +885,8 @@ __ssh_env () { u=$1 s=$2 - ssh-copy-id -oStrictHostKeyChecking=no -i ~/.ssh/id_ed25519 $u@$s > /dev/null 2>&1 - scp ~/.bashrc $u@$s:~/.bash_profile + ssh-copy-id -oStrictHostKeyChecking=no -i $HOMEDIR/.ssh/id_ed25519 $u@$s > /dev/null 2>&1 + scp $HOMEDIR/.bashrc $u@$s:$HOMEDIR/.bash_profile ssh -q -X -oStrictHostKeyChecking=no $u@$s } @@ -895,18 +896,18 @@ __crossword () { } __install_ssh_keypair_files () { - mkdir ~/.ssh/ + mkdir $HOMEDIR/.ssh/ echo "-----BEGIN OPENSSH PRIVATE KEY----- b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW QyNTUxOQAAACAZREl5zjYh3/3Gs1WXI7Yt4spiWHMCbx3PK+jnexG+hwAAAKDS7Hi00ux4 tAAAAAtzc2gtZWQyNTUxOQAAACAZREl5zjYh3/3Gs1WXI7Yt4spiWHMCbx3PK+jnexG+hw AAAECdSCzE3tYW7sk3s8P6BQSvf8c52Jtz8n3bC963bJtj9hlESXnONiHf/cazVZcjti3i ymJYcwJvHc8r6Od7Eb6HAAAAGGFnZWlzc2xlci50dXguMjIxMjE0MTAwMgECAwQF ------END OPENSSH PRIVATE KEY-----" > ~/.ssh/id_ed25519 - chmod 0600 ~/.ssh/id_ed25519 +-----END OPENSSH PRIVATE KEY-----" > $HOMEDIR/.ssh/id_ed25519 + chmod 0600 $HOMEDIR/.ssh/id_ed25519 - echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBlESXnONiHf/cazVZcjti3iymJYcwJvHc8r6Od7Eb6H ageissler.tux.2212141002" > ~/.ssh/id_ed25519.pub - chmod 0600 ~/.ssh/id_ed25519.pub + echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBlESXnONiHf/cazVZcjti3iymJYcwJvHc8r6Od7Eb6H ageissler.tux.2212141002" > $HOMEDIR/.ssh/id_ed25519.pub + chmod 0600 $HOMEDIR/.ssh/id_ed25519.pub echo "-----BEGIN OPENSSH PRIVATE KEY----- b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABFwAAAAdzc2gtcn @@ -934,19 +935,19 @@ S++8TK0GuFhIat+MsiAHWTLvQv6pPbsFU5/ZtbjUXu93wyIRMAAACBAMwB3fah8Rc7M0jq 7otanizTxEVUvJG6vwQh56kb2V5iM0MInlebGblxNrwzZq+c8F/oFGhwEwQb0QnnCp8yva udFwOoIdCrLECMaAOCtOrObBwy7wSQH3RTbxn8Fn4tvFfD0FJKOtch+NuwtSbIC5buqrF/ 0oGKMagDiaaZmHBrAAAAEmNvbmV0YWRtQGNvbmx4YW5zMQ== ------END OPENSSH PRIVATE KEY-----" > ~/.ssh/ansible_id_rsa - chmod 0600 ~/.ssh/ansible_id_rsa +-----END OPENSSH PRIVATE KEY-----" > $HOMEDIR/.ssh/ansible_id_rsa + chmod 0600 $HOMEDIR/.ssh/ansible_id_rsa - echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/gz8mIcQmAxOVbajBb0nO7jWI09TXfHn6kNg6E/43bSzu10qq3hatTPuuXgaU6Y/KMkGF0nt6nsufP3P9u1FrCtq5j175z3GCQjk6Mb5QOO9iKLO9fQV08d6j3C7YGc1+6SZlTKdReyfBy7lQAfeUMuvFT4KevMExzyzvAtgQ8ZtLHwEUWBW5F/0YIGZyr6cMNe09RT2WTYJIbQCTzfVuWbOPw2SFzvd4ls7TnLK3EU4kjujnzBsTOAJLkbaWFVm6i+W6M3N+TutrtoDcW12Q9CK5eQtVwQrMWS1JbAAIGke1TKeizgDt5EuWk4k5YovXv6wrcWT9SahgeKDVtCLx ansible" > ~/.ssh/ansible_id_rsa.pub - chmod 0600 ~/.ssh/ansible_id_rsa.pub + echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/gz8mIcQmAxOVbajBb0nO7jWI09TXfHn6kNg6E/43bSzu10qq3hatTPuuXgaU6Y/KMkGF0nt6nsufP3P9u1FrCtq5j175z3GCQjk6Mb5QOO9iKLO9fQV08d6j3C7YGc1+6SZlTKdReyfBy7lQAfeUMuvFT4KevMExzyzvAtgQ8ZtLHwEUWBW5F/0YIGZyr6cMNe09RT2WTYJIbQCTzfVuWbOPw2SFzvd4ls7TnLK3EU4kjujnzBsTOAJLkbaWFVm6i+W6M3N+TutrtoDcW12Q9CK5eQtVwQrMWS1JbAAIGke1TKeizgDt5EuWk4k5YovXv6wrcWT9SahgeKDVtCLx ansible" > $HOMEDIR/.ssh/ansible_id_rsa.pub + chmod 0600 $HOMEDIR/.ssh/ansible_id_rsa.pub } __install_ssh_authorized_key () { if [ "$1" == "" ] then - echo "Installiert ssh-ed25519 in ~/.ssh/authorized_keys" + echo "Installiert ssh-ed25519 in $HOMEDIR/.ssh/authorized_keys" __prompt_confirm "Weiter?" || return 0 - echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBlESXnONiHf/cazVZcjti3iymJYcwJvHc8r6Od7Eb6H ageissler.tux.2212141002" >> ~/.ssh/authorized_keys + echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBlESXnONiHf/cazVZcjti3iymJYcwJvHc8r6Od7Eb6H ageissler.tux.2212141002" >> $HOMEDIR/.ssh/authorized_keys else echo "Installiert ssh-ed25519 in /home/$1/.ssh/authorized_keys" __prompt_confirm "Weiter?" || return 0 @@ -954,13 +955,13 @@ __install_ssh_authorized_key () { fi } -PATH="/home/andre/perl5/bin${PATH:+:${PATH}}"; export PATH; -PERL5LIB="/home/andre/perl5/lib/perl5${PERL5LIB:+:${PERL5LIB}}"; export PERL5LIB; -PERL_LOCAL_LIB_ROOT="/home/andre/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}"; export PERL_LOCAL_LIB_ROOT; -PERL_MB_OPT="--install_base \"/home/andre/perl5\""; export PERL_MB_OPT; -PERL_MM_OPT="INSTALL_BASE=/home/andre/perl5"; export PERL_MM_OPT; +PATH="$HOMEDIR/perl5/bin${PATH:+:${PATH}}"; export PATH; +PERL5LIB="$HOMEDIR/perl5/lib/perl5${PERL5LIB:+:${PERL5LIB}}"; export PERL5LIB; +PERL_LOCAL_LIB_ROOT="$HOMEDIR/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}"; export PERL_LOCAL_LIB_ROOT; +PERL_MB_OPT="--install_base \"$HOMEDIR/perl5\""; export PERL_MB_OPT; +PERL_MM_OPT="INSTALL_BASE=$HOMEDIR/perl5"; export PERL_MM_OPT; -rm -f ~/.bash_profile +rm -f $HOMEDIR/.bash_profile HOSTNAME=`hostname` if [ "$HOSTNAME" != "server" ] @@ -977,20 +978,20 @@ then do source $i done - for i in `ls ~/bash_extensions/*.bash` + for i in `ls $HOMEDIR/bash_extensions/*.bash` do bash $i done if [ "$OS" == "" ]; then - if [ ! -f ~/bike.jpg ]; then - timeout 3 scp -o ConnectTimeout=2 -P 2222 andregeissler@vesta.agserver.de:~/web/tools.andregeissler.de/public_html/bike.jpg ~/bike.jpg + if [ ! -f $HOMEDIR/bike.jpg ]; then + timeout 3 scp -o ConnectTimeout=2 -P 2222 andregeissler@vesta.agserver.de:$HOMEDIR/web/tools.andregeissler.de/public_html/bike.jpg $HOMEDIR/bike.jpg fi - if [ ! -f ~/ascii-image-converter ]; then - timeout 3 scp -o ConnectTimeout=2 -P 2222 andregeissler@vesta.agserver.de:~/web/tools.andregeissler.de/public_html/ascii-image-converter ~/ascii-image-converter + if [ ! -f $HOMEDIR/ascii-image-converter ]; then + timeout 3 scp -o ConnectTimeout=2 -P 2222 andregeissler@vesta.agserver.de:$HOMEDIR/web/tools.andregeissler.de/public_html/ascii-image-converter $HOMEDIR/ascii-image-converter fi if echo "$-" | grep i > /dev/null; then - echo ; ~/ascii-image-converter -C ~/bike.jpg -d 80,23 | tr "@" " " ; echo + echo ; $HOMEDIR/ascii-image-converter -C $HOMEDIR/bike.jpg -d 80,23 | tr "@" " " ; echo fi fi fi \ No newline at end of file