Added repo clone in project-open, cleaning installation script

4 files changed, 70 insertions, 39 deletions

diff --git a/bin/battery-low-check b/bin/battery-low-check
new file mode 100755
index 0000000..dbbdc6b
--- /dev/null
+++ b/bin/battery-low-check
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+capacity=$(cat /sys/class/power_supply/BAT0/capacity)
+
+[ "$capacity" -lt 10 ] && notify-send -u critical "Battery low $capacity%"
diff --git a/bin/project-open b/bin/project-open
index a4bf523..0dd5d31 100755
--- a/bin/project-open
+++ b/bin/project-open
@@ -10,22 +10,33 @@ dest=$(
 
 [ -z "$dest" ] && exit 1
 
-if cd "$HOME/git/$dest" 2> /dev/null
+dest_path="$HOME/git/$dest"
+
+if cd "$dest_path" 2> /dev/null
 then
-    touch "$HOME/git/$dest"
+    touch "$dest_path"
     st
 else
     while [ -z "$choice" ]
     do
-        choice=$(printf 'yes\nno\n' | dmenu -p "Create a repository at ~/git/$dest?")
+        choice=$(printf 'create\nclone\ncancel' | dmenu -p "New repository at ~/git/$dest?")
     done
 
     case "$choice" in
-        "no")   exit ;;
-        "yes")  mkdir -p "$HOME/git/$dest" ;;
-        *)      exit 1 ;;
+        "create")
+            mkdir -p "$dest_path"
+            cd "$dest_path" || exit 1
+            git init
+            ;;
+        "clone")
+            url="$(echo '' | dmenu -p "Entry repository url: ")"
+            notify-send "Cloning $url to $dest_path"
+            git clone --recursive "$url" "$dest_path" ||
+                (notify-send -u critical "Clone failed"; exit 1)
+            cd "$dest_path" || exit 1
+            ;;
+        "cancel") exit ;;
+        *) exit 1 ;;
     esac
-    cd "$HOME/git/$dest" || exit 1
-    git init
     st
 fi
diff --git a/dunst/dunstrc b/dunst/dunstrc
index 12198ed..a9eba7f 100644
--- a/dunst/dunstrc
+++ b/dunst/dunstrc
@@ -292,7 +292,7 @@
     background = "#900000"
     foreground = "#ffffff"
     frame_color = "#ff0000"
-    timeout = 0
+    timeout = 15
     # Icon for notifications with critical urgency, uncomment to enable
     #icon = /path/to/icon
 
diff --git a/install b/install
index 893c96f..93ea77a 100755
--- a/install
+++ b/install
@@ -2,30 +2,30 @@
 
 create_dotfile_link()
 {
-    ln -svf $DOTDIR/$1 $HOME/$2
+    ln -svf "$DOTDIR/$1" "$HOME/$2"
 }
 
 create_dotfile_link_same()
 {
-    create_dotfile_link $1 $1
+    create_dotfile_link "$1" "$1"
 }
 
-###########################
-# dotfiles install script #
-###########################
+###############################################################################
+# link dotfiles
+###############################################################################
 
 # dotfiles directory
-[ -z $DOTDIR ] && export DOTDIR=`pwd`
+[ -z "$DOTDIR" ] && DOTDIR=$(pwd) && export DOTDIR
 
 # Creating links
 create_dotfile_link_same .zshrc
 create_dotfile_link_same .bashrc
 create_dotfile_link_same .vimrc
 create_dotfile_link_same .pluggins.vim
-[ ! -d $HOME/.vim/plugin ] && mkdir -p $HOME/.vim/plugin
+mkdir -p "$HOME/.vim/plugin"
 create_dotfile_link grep.vim .vim/plugin/grep.vim
 
-[ ! -d $HOME/.xmonad ] && mkdir $HOME/.xmonad
+mkdir -p "$HOME/.xmonad"
 create_dotfile_link xmonad.hs .xmonad/xmonad.hs
 
 create_dotfile_link_same .gdbinit
@@ -36,37 +36,52 @@ create_dotfile_link_same .mailcap
 create_dotfile_link_same .xinitrc
 create_dotfile_link_same .zprofile
 
-[ ! -d $HOME/.config ] && mkdir $HOME/.config
+mkdir -p "$HOME/.config"
 create_dotfile_link redshift.conf .config/redshift.conf
 
-create_dotfile_link_same slock/config.def.h
+mkdir -p "$HOME/.config/dunst"
+create_dotfile_link dunst/dunstrc .config/dunst/dunstrc
 
-################
-# dependencies #
-################
+mkdir -p "$HOME/.newsboat"
+create_dotfile_link_same .newsboat/config
 
-[ $# -ge 1 ] || [ "$1" = "--ln" ] && exit 0
+# create_dotfile_link_same slock/config.def.h
+
+
+###############################################################################
+# dependencies
+###############################################################################
+
+[ "$#" -ne 1 ] || [ ! "$1" = "-a" ] && exit 0
 echo "Installing Dependencies"
 
+###############################################################################
 # vim Plug
-PLUGFILE=$HOME/.vim/autoload/plug.vim
+PLUGFILE="$HOME/.vim/autoload/plug.vim"
 PLUGURL='https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
-[ ! -f $PLUGFILE ] && echo "Downloading plug.vim" && \
-    curl -fLo $PLUGFILE --create-dirs $PLUGURL
+[ ! -f "$PLUGFILE" ] && echo "Downloading plug.vim" && \
+    curl -fLo "$PLUGFILE" --create-dirs "$PLUGURL"
 echo "Installing plug.vim Pluggins"
 vim -c "PlugInstall" -c "qa"
 
+###############################################################################
 # zsh pluggins
-[ ! -d $HOME/.zsh ] && make $HOME/.zsh
-# pure theme
-[ ! -d $HOME/.zsh/pure ] && echo "Installing zsh pure theme" && \
-    git clone https://github.com/sindresorhus/pure \
-    $HOME/.zsh/pure
-# syntax hightlighting
-[ ! -d $HOME/.zsh/zsh-syntax-highlighting ] && echo "Installing zsh syntax highlighting plugin" && \
-    git clone https://github.com/zsh-users/zsh-syntax-highlighting \
-    $HOME/.zsh/zsh-syntax-highlighting
-# you should use
-[ ! -d $HOME/.zsh/zsh-you-should-use ] && echo "Installing zsh you should use plugin" && \
-    git clone https://github.com/MichaelAquilina/zsh-you-should-use \
-    $HOME/.zsh/zsh-you-should-use
+
+update_plugin()
+{
+    url="$1"
+    dest_path="$2"
+    if [ ! -d "$dest_path" ]
+    then
+        echo "Installing $dest_path"
+        git clone "$url" "$dest_path"
+    else
+        echo "Updating $dest_path"
+        git -C "$dest_path" pull
+    fi
+}
+
+mkdir -p "$HOME/.zsh"
+update_plugin 'https://github.com/sindresorhus/pure' "$HOME/.zsh/pure"
+update_plugin 'https://github.com/zsh-users/zsh-syntax-highlighting' "$HOME/.zsh/zsh-syntax-highlighting"
+update_plugin 'https://github.com/MichaelAquilina/zsh-you-should-use' "$HOME/.zsh/zsh-you-should-use"