From 6f679982b63b6d40660ca601fc7e06ca6e61cdcd Mon Sep 17 00:00:00 2001 From: johannst Date: Thu, 2 Feb 2017 11:44:54 +0100 Subject: added missing variable in vim installer --- install | 1 + 1 file changed, 1 insertion(+) diff --git a/install b/install index 64116ea..8672960 100755 --- a/install +++ b/install @@ -83,6 +83,7 @@ function vimConfigInstaller() { mkdir $vim_home > /dev/null 2>&1 ln -s $ABS_BASE_DIR/vim/* $vim_home echo -e "\n\" $gMagicNumber - Auto generated, do not delete or modify!" >> $vimrc + echo -e "let \$MYVIMRC='$ABS_BASE_DIR/vimrc'" >> $vimrc echo -e "let \$VIMHOME='$vim_home'" >> $vimrc echo -e "source $ABS_BASE_DIR/vimrc" >> $vimrc git clone https://github.com/VundleVim/Vundle.vim.git $vim_home/bundle/Vundle.vim -- cgit v1.2.3 From 8930c50b8d38b3ea909230f728296fac63853a72 Mon Sep 17 00:00:00 2001 From: johannst Date: Sun, 12 Feb 2017 00:47:41 +0100 Subject: added tmux.conf installer + minor fixes --- install | 25 ++++++++++++++++--------- install.config | 14 +++++++------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/install b/install index 8672960..7205287 100755 --- a/install +++ b/install @@ -25,11 +25,11 @@ function bashrcInstaller() { touch $bashrc grep $gMagicNumber $bashrc > /dev/null 2>&1 if [[ $? = 0 ]]; then - return + return 1 fi echo -e "\n# $gMagicNumber - Auto generated, do not delete or modify!" >> $bashrc echo -e "source $ABS_BASE_DIR/bashrc" >> $bashrc - echo "[Info]: bashrc sucessfully installed!" + return 0 } #}}} @@ -54,19 +54,21 @@ function gitConfigInstaller() { touch $gitconf grep $gMagicNumber $gitconf > /dev/null 2>&1 if [[ $? = 0 ]]; then - return + return 1 fi echo -e "\n# $gMagicNumber - Auto generated, do not delete or modify!" >> $gitconf echo -e "[include]" >> $gitconf echo -e " path = $ABS_BASE_DIR/gitconfig" >> $gitconf - echo "[Info]: gitconfig sucessfully installed!" + return 0 } #}}} #{{{ tmuxConfigInstaller function tmuxConfigInstaller() { - echo "tmuxConfigInstaller called" + local tmuxconf=~/.tmux.conf + ln -s $ABS_BASE_DIR/tmux.conf $tmuxconf + return 0 } #}}} @@ -78,7 +80,7 @@ function vimConfigInstaller() { touch $vimrc grep $gMagicNumber $vimrc > /dev/null 2>&1 if [[ $? = 0 ]]; then - return + return 1 fi mkdir $vim_home > /dev/null 2>&1 ln -s $ABS_BASE_DIR/vim/* $vim_home @@ -88,7 +90,7 @@ function vimConfigInstaller() { echo -e "source $ABS_BASE_DIR/vimrc" >> $vimrc git clone https://github.com/VundleVim/Vundle.vim.git $vim_home/bundle/Vundle.vim vim +PluginInstall +qall - echo "[Info]: vim config sucessfully installed!" + return 0 } #}}} @@ -134,12 +136,12 @@ installConfig() { local binary=$(getDepenentBinaryName $config) isBinaryInstalled $binary if [[ $? -eq 1 ]]; then - echo "[Warning]: Skipping $config... $config is not installed!" + echo "[Warning]: Skipping $config... $binary is not installed!" return fi local installerFctPtr=$(getConfigInstallerFctPtr $config) if [[ -z $installerFctPtr ]]; then - echo "[Warning]: Skipping $config... installer function pointer loopup error!" + echo "[Warning]: Skipping $config... installer function pointer lookup error!" return fi isInstallerDefined $installerFctPtr @@ -149,6 +151,11 @@ installConfig() { fi echo "[Info]: Intalling config for $binary using $installerFctPtr!" $installerFctPtr + if [[ $? -eq 1 ]]; then + echo "[Info]: $config already installed!" + return + fi + echo "[Info]: $config sucessfully installed!" } getValue() { diff --git a/install.config b/install.config index 8f01435..26d4325 100644 --- a/install.config +++ b/install.config @@ -3,10 +3,10 @@ # line format: [yYnN] - # lines not starting with [yYnN] are ignored -y - bashrc -y - cgdb -y - conkyrc -y - gitconfig -y - tmux.conf -y - vimrc -y - Xresources +n - bashrc +n - cgdb +n - conkyrc +n - gitconfig +n - tmux.conf +n - vimrc +n - Xresources -- cgit v1.2.3