mio/easyzsh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5 from jotyGill/develop

Browse Source 
Better Output
This commit is contained in:
jotyGill
2020-02-26 06:24:13 +00:00
committed by GitHub
parent 9301c5494d ccaaf651a7
commit d6d255ab3a
1 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
quickz.sh
View File

@@ -18,7 +18,7 @@ fi
echo -e "Installing oh-my-zsh\n" echo -e "Installing oh-my-zsh\n"
if [ -d ~/.oh-my-zsh ]; then if [ -d ~/.oh-my-zsh ]; then
echo -e "oh-my-zsh is already installed" echo -e "oh-my-zsh is already installed\n"
else else
git clone --depth=1 git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh git clone --depth=1 git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
fi fi
@@ -26,7 +26,7 @@ fi
cp -f .zshrc ~/ cp -f .zshrc ~/
mkdir ~/.quickzsh # external plugins, things, will be instlled in here mkdir -p ~/.quickzsh # external plugins, things, will be instlled in here
if [ -d ~/.oh-my-zsh/plugins/zsh-autosuggestions ]; then if [ -d ~/.oh-my-zsh/plugins/zsh-autosuggestions ]; then
cd ~/.oh-my-zsh/plugins/zsh-autosuggestions && git pull cd ~/.oh-my-zsh/plugins/zsh-autosuggestions && git pull
@@ -40,7 +40,7 @@ else
git clone --depth=1 https://github.com/zsh-users/zsh-syntax-highlighting.git ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting git clone --depth=1 https://github.com/zsh-users/zsh-syntax-highlighting.git ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting
fi fi
if [ -d ~/.oh-my-zsh/custom/plugins/zsh-completions]; then if [ -d ~/.oh-my-zsh/custom/plugins/zsh-completions ]; then
cd ~/.oh-my-zsh/custom/plugins/zsh-completions && git pull cd ~/.oh-my-zsh/custom/plugins/zsh-completions && git pull
else else
git clone --depth=1 https://github.com/zsh-users/zsh-completions ~/.oh-my-zsh/custom/plugins/zsh-completions git clone --depth=1 https://github.com/zsh-users/zsh-completions ~/.oh-my-zsh/custom/plugins/zsh-completions
@@ -57,9 +57,9 @@ fi
echo -e "Installing Nerd Fonts version of Hack, Roboto Mono, DejaVu Sans Mono\n" echo -e "Installing Nerd Fonts version of Hack, Roboto Mono, DejaVu Sans Mono\n"
wget -N https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/Hack/Regular/complete/Hack%20Regular%20Nerd%20Font%20Complete.ttf -P ~/.fonts/ wget -q --show-progress -N https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/Hack/Regular/complete/Hack%20Regular%20Nerd%20Font%20Complete.ttf -P ~/.fonts/
wget -N https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/RobotoMono/Regular/complete/Roboto%20Mono%20Nerd%20Font%20Complete.ttf -P ~/.fonts/ wget -q --show-progress -N https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/RobotoMono/Regular/complete/Roboto%20Mono%20Nerd%20Font%20Complete.ttf -P ~/.fonts/
wget -N https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/DejaVuSansMono/Regular/complete/DejaVu%20Sans%20Mono%20Nerd%20Font%20Complete.ttf -P ~/.fonts/ wget -q --show-progress -N https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/DejaVuSansMono/Regular/complete/DejaVu%20Sans%20Mono%20Nerd%20Font%20Complete.ttf -P ~/.fonts/
fc-cache -fv ~/.fonts fc-cache -fv ~/.fonts
@@ -80,13 +80,13 @@ fi
if [ -d ~/.oh-my-zsh/custom/plugins/k ]; then if [ -d ~/.oh-my-zsh/custom/plugins/k ]; then
cd ~/.oh-my-zsh/custom/plugins/k && git pull cd ~/.oh-my-zsh/custom/plugins/k && git pull
else else
git clone --depth 1 https://github.com/supercrabtree/k ~/.oh-my-zsh/custom/plugins/k; then : git clone --depth 1 https://github.com/supercrabtree/k ~/.oh-my-zsh/custom/plugins/k
fi fi
if [ -d ~/.quickzsh/marker ]; then if [ -d ~/.quickzsh/marker ]; then
cd ~/.quickzsh/marker && git pull cd ~/.quickzsh/marker && git pull
else else
git clone --depth 1 https://github.com/pindexis/marker ~/.quickzsh/marker; then : git clone --depth 1 https://github.com/pindexis/marker ~/.quickzsh/marker
fi fi
if ~/.quickzsh/marker/install.py; then if ~/.quickzsh/marker/install.py; then
@@ -105,7 +105,7 @@ fi
if [ ! -L ~/.quickzsh/todo/bin/todo.sh ]; then if [ ! -L ~/.quickzsh/todo/bin/todo.sh ]; then
echo -e "Installing todo.sh in ~/.quickzsh/todo\n" echo -e "Installing todo.sh in ~/.quickzsh/todo\n"
mkdir -p ~/.quickzsh/todo/bin mkdir -p ~/.quickzsh/todo/bin
wget "https://github.com/todotxt/todo.txt-cli/releases/download/v2.11.0/todo.txt_cli-2.11.0.tar.gz" -P ~/.quickzsh/ wget -q --show-progress "https://github.com/todotxt/todo.txt-cli/releases/download/v2.11.0/todo.txt_cli-2.11.0.tar.gz" -P ~/.quickzsh/
tar xvf ~/.quickzsh/todo.txt_cli-2.11.0.tar.gz -C ~/.quickzsh/todo --strip 1 && rm ~/.quickzsh/todo.txt_cli-2.11.0.tar.gz tar xvf ~/.quickzsh/todo.txt_cli-2.11.0.tar.gz -C ~/.quickzsh/todo --strip 1 && rm ~/.quickzsh/todo.txt_cli-2.11.0.tar.gz
ln -s ~/.quickzsh/todo/todo.sh ~/.quickzsh/todo/bin/todo.sh # so only .../bin is included in $PATH ln -s ~/.quickzsh/todo/todo.sh ~/.quickzsh/todo/bin/todo.sh # so only .../bin is included in $PATH
ln -s ~/.quickzsh/todo/todo.cfg ~/.todo.cfg # it expects it there or ~/todo.cfg or ~/.todo/config ln -s ~/.quickzsh/todo/todo.cfg ~/.todo.cfg # it expects it there or ~/todo.cfg or ~/.todo/config
@@ -113,14 +113,14 @@ else
echo -e "todo.sh is already instlled in ~/.quickzsh/todo/bin/\n" echo -e "todo.sh is already instlled in ~/.quickzsh/todo/bin/\n"
fi fi
if [[ $1 == "--cp-hist" ]] || [ $1 == "-c" ]; then if [[ $1 == "--cp-hist" ]] || [[ $1 == "-c" ]]; then
echo -e "\nCopying bash_history to zsh_history\n" echo -e "\nCopying bash_history to zsh_history\n"
if command -v python &>/dev/null; then if command -v python &>/dev/null; then
wget https://gist.githubusercontent.com/muendelezaji/c14722ab66b505a49861b8a74e52b274/raw/49f0fb7f661bdf794742257f58950d209dd6cb62/bash-to-zsh-hist.py wget -q --show-progress https://gist.githubusercontent.com/muendelezaji/c14722ab66b505a49861b8a74e52b274/raw/49f0fb7f661bdf794742257f58950d209dd6cb62/bash-to-zsh-hist.py
cat ~/.bash_history | python bash-to-zsh-hist.py >> ~/.zsh_history cat ~/.bash_history | python bash-to-zsh-hist.py >> ~/.zsh_history
else else
if command -v python3 &>/dev/null; then if command -v python3 &>/dev/null; then
wget https://gist.githubusercontent.com/muendelezaji/c14722ab66b505a49861b8a74e52b274/raw/49f0fb7f661bdf794742257f58950d209dd6cb62/bash-to-zsh-hist.py wget -q --show-progress https://gist.githubusercontent.com/muendelezaji/c14722ab66b505a49861b8a74e52b274/raw/49f0fb7f661bdf794742257f58950d209dd6cb62/bash-to-zsh-hist.py
cat ~/.bash_history | python3 bash-to-zsh-hist.py >> ~/.zsh_history cat ~/.bash_history | python3 bash-to-zsh-hist.py >> ~/.zsh_history
else else
echo "Python is not installed, can't copy bash_history to zsh_history\n" echo "Python is not installed, can't copy bash_history to zsh_history\n"