mirror of
https://github.com/brunofontes/linuxShortcuts.git
synced 2024-11-24 00:50:51 +00:00
Merge branch 'master' of github.com:brunofontes/linuxShortcuts
This commit is contained in:
commit
3dc139dcb6
@ -16,16 +16,18 @@ read -s sudoPass
|
||||
echo
|
||||
s "echo '**********'"
|
||||
|
||||
bold "Pacman-mirrors -g"
|
||||
s "pacman-mirrors -g"
|
||||
bold "Pacman-mirrors -c"
|
||||
s "pacman-mirrors -c Brazil Chile United_States"
|
||||
|
||||
bold "Updating with PACMAN..."
|
||||
#bold "Updating with PACMAN..."
|
||||
s "pacman -Syu --color always"
|
||||
|
||||
bold "Updating with AURMAN..."
|
||||
s "echo"
|
||||
aurman -Su --noedit --noconfirm --color always
|
||||
|
||||
bold "Cleaning stuff..."
|
||||
echo -e "$sudoPass\n" | yes | (sudo -S pacman -Rns $(pacman -Qtdq) --color always)
|
||||
s "echo"
|
||||
yes | (sudo -S pacman -Rns $(pacman -Qtdq) --color always)
|
||||
|
||||
notify-send "Update script has finished!"
|
||||
|
16
zshrc
16
zshrc
@ -102,7 +102,7 @@ alias gch='git checkout'
|
||||
alias gc='git commit'
|
||||
alias gs='git status'
|
||||
alias gpull='sshadd; git pull origin $(git_current_branch)'
|
||||
alias gp='sshadd; git gc --auto; git push --all origin; git push --tags'
|
||||
alias gp='sshadd; git gc --auto; git push --all origin; git push --tags origin'
|
||||
alias glog='git log --graph --oneline --decorate -n 10 --color'
|
||||
alias update='bash ~/Apps/linuxShortcuts/Pacman/updateRepositories.sh'
|
||||
alias grep='grep --color=auto'
|
||||
@ -114,9 +114,10 @@ alias du='ncdu --color dark --exclude .git'
|
||||
alias clearLogs='sudo find /var/log -mtime +30 -type f -delete'
|
||||
alias vzsh='vim ~/.zshrc && source ~/.zshrc'
|
||||
alias ssh='sshadd; /usr/bin/ssh'
|
||||
alias rm='/usr/bin/rm -I'
|
||||
|
||||
function vagrant () {
|
||||
builtin cd ~/development/laravelHomestead && /usr/bin/vagrant $* && builtin cd -
|
||||
builtin cd ~/development/laravelHomestead && /usr/bin/vagrant $*; builtin cd -
|
||||
}
|
||||
|
||||
function mkcd () { mkdir -p "$1" && builtin cd -P -- "$1" }
|
||||
@ -124,6 +125,11 @@ function sshadd() { ssh-add -l > /dev/null || ssh-add }
|
||||
function le { "$1" | less }
|
||||
function cd { echo; builtin cd "$1"; ls --color=tty; echo; echo PWD: "$PWD" }
|
||||
|
||||
function gmerge()
|
||||
{
|
||||
branch=$(git_current_branch); git checkout "$1"; git merge "$branch"; git checkout "$branch"
|
||||
}
|
||||
|
||||
function extract() # Handy Extract Program.
|
||||
{
|
||||
if [ -f $1 ] ; then
|
||||
@ -172,3 +178,9 @@ fi
|
||||
|
||||
#Bruno - Keep "LESS" content on screen when exit
|
||||
export LESS="-XFR"
|
||||
|
||||
#Bruno - Gnome keyring
|
||||
if [ -n "$DESKTOP_SESSION" ];then
|
||||
eval $(gnome-keyring-daemon --start)
|
||||
export SSH_AUTH_SOCK
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user