Merge branch 'master' of https://github.com/xundeenergie/myshellconfig
This commit is contained in:
commit
dcd10f3301
4 changed files with 24 additions and 16 deletions
4
aliases
4
aliases
|
@ -100,7 +100,7 @@ alias u=umount
|
|||
alias testmail='echo testemail von ${USER}@${HOSTNAME} am $(date)|mail -s "TESTEMAIL ${USER}@${HOSTNAME} $(date)"'
|
||||
|
||||
# logging
|
||||
alias tailmail='sudo tail -f /var/log/mail.log /var/log/exim4/mainlog /var/log/exim4/rejectlog /var/log/exim4/paniclog'
|
||||
alias tailexim='sudo tail -f /var/log/mail.log /var/log/exim4/mainlog /var/log/exim4/rejectlog /var/log/exim4/paniclog'
|
||||
alias tailmail='sudo journalctl -f -u exim4.service -u dovecot.service -u rspamd.service -u getmail*'
|
||||
alias taildemsg='sudo watch -n1 "dmesg|tail -n20"'
|
||||
alias tailsys='sudo tail -f /var/log/syslog /var/log/dmesg'
|
||||
|
@ -121,6 +121,8 @@ alias unetbootin='export QT_X11_NO_MITSHM=1 unetbootin'
|
|||
alias vi='/usr/bin/vim'
|
||||
alias vlc='VDPAU_DRIVER=va_gl vlc'
|
||||
alias tmux='tmux -f ~/.tmux.conf'
|
||||
alias youtube-dl-whole-user="youtube-dl --yes-playlist --write-description --write-info-json --write-annotations --write-all-thumbnails -f 'mp4' -o '%(uploader)s/%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s' -w -c "
|
||||
alias youtube-dl-whole-playlist="youtube-dl --yes-playlist --write-description --write-info-json --write-annotations --write-all-thumbnails -f 'mp4' -o '%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s' -w -c "
|
||||
|
||||
# rock64
|
||||
alias rock64='sudo minicom -D /dev/ttyUSB0 --color=on'
|
||||
|
|
|
@ -27,6 +27,7 @@ if [[ $- = *i* ]] ; then
|
|||
[ -z "${MYSHELLCONFIG_GIT_TIMEOUT+x}" ] && MYSHELLCONFIG_GIT_TIMEOUT=5s
|
||||
[ -z "${MYSHELLCONFIG_GIT_CHECKOUT_TIMEOUT+x}" ] && MYSHELLCONFIG_GIT_CHECKOUT_TIMEOUT=20s
|
||||
MYSHELLCONFIG_BASH_COMPLETION="${HOME}/${MYSHELLCONFIG_SUBPATH}/bash_completion.d"
|
||||
[ -z "${MYSHELLCONFIG_GIT_SYNC+x}" ] && MYSHELLCONFIG_GIT_SYNC=true
|
||||
|
||||
SGIT="git -C ${MYSHELLCONFIG_BASE}"
|
||||
export MYSHELLCONFIG_BASE MYSHELLCONFIG_LOGDIR MYSHELLCONFIG_LOGFILE SGIT MYSHELLCONFIG_VIM_PLUGINS
|
||||
|
@ -52,6 +53,7 @@ EOF
|
|||
}
|
||||
|
||||
sync_config () {
|
||||
if $MYSHELLCONFIG_GIT_SYNC; then
|
||||
local nok=""
|
||||
local gco=""
|
||||
if which git >/dev/null; then
|
||||
|
@ -69,6 +71,9 @@ EOF
|
|||
else
|
||||
echo "git not installed, no configuration possible, please install git" >&2
|
||||
fi
|
||||
else
|
||||
echo "Not syncing profile in case of configuration"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
|
|
2
bin/youtube-dl-download-or-update.sh
Executable file
2
bin/youtube-dl-download-or-update.sh
Executable file
|
@ -0,0 +1,2 @@
|
|||
#!/bin/bash
|
||||
youtube-dl --write-description --write-info-json --write-annotations --write-all-thumbnails -f 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/best[ext=mp4]/best' -o '%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s' -c -w -a ./url
|
|
@ -131,7 +131,6 @@ if ! $SSHS; then
|
|||
vim -c "PluginInstall" -c ":qa!"
|
||||
fi
|
||||
[ -z ${MYSHELLCONFIG_GIT_REMOTE_PUSH+x} ] || $SGIT remote set-url --push ${MYSHELLCONFIG_GIT_REMOTE_NAME} "${MYSHELLCONFIG_GIT_REMOTE_PUSH}"
|
||||
# cd ${HOME}
|
||||
;;
|
||||
*screen*)
|
||||
echo "I'm in sceen/tmux now" >&2
|
||||
|
|
Loading…
Reference in a new issue