From f566bc9aea63c17325b9e23fa1605529ea49e2ed Mon Sep 17 00:00:00 2001 From: Johnny Robeson Date: Fri, 27 Jun 2014 17:42:24 -0400 Subject: [PATCH] rename APP_DIR to APP_PATH in win installers --- spf13-vim-windows-install.cmd | 32 ++++++++++++++++---------------- spf13-vim-windows-xp-install.cmd | 30 +++++++++++++++--------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/spf13-vim-windows-install.cmd b/spf13-vim-windows-install.cmd index fb8339e..2d6b8e2 100644 --- a/spf13-vim-windows-install.cmd +++ b/spf13-vim-windows-install.cmd @@ -16,29 +16,29 @@ REM limitations under the License. @if not exist "%HOME%" @set HOME=%HOMEDRIVE%%HOMEPATH% @if not exist "%HOME%" @set HOME=%USERPROFILE% -@set APP_DIR=%HOME%\.spf13-vim-3 -IF NOT EXIST "%APP_DIR%" ( - call git clone -b 3.0 https://github.com/spf13/spf13-vim.git "%APP_DIR%" +@set APP_PATH=%HOME%\.spf13-vim-3 +IF NOT EXIST "%APP_PATH%" ( + call git clone -b 3.0 https://github.com/spf13/spf13-vim.git "%APP_PATH%" ) ELSE ( @set ORIGINAL_DIR=%CD% echo updating spf13-vim - chdir /d "%APP_DIR%" + chdir /d "%APP_PATH%" call git pull chdir /d "%ORIGINAL_DIR%" - call cd "%APP_DIR%" + call cd "%APP_PATH%" ) -call mklink "%HOME%\.vimrc" "%APP_DIR%\.vimrc" -call mklink "%HOME%\_vimrc" "%APP_DIR%\.vimrc" -call mklink "%HOME%\.vimrc.fork" "%APP_DIR%\.vimrc.fork" -call mklink "%HOME%\.vimrc.bundles" "%APP_DIR%\.vimrc.bundles" -call mklink "%HOME%\.vimrc.bundles.fork" "%APP_DIR%\.vimrc.bundles.fork" -call mklink "%HOME%\.vimrc.before" "%APP_DIR%\.vimrc.before" -call mklink "%HOME%\.vimrc.before.fork" "%APP_DIR%\.vimrc.before.fork" -call mklink /J "%HOME%\.vim" "%APP_DIR%\.vim" +call mklink "%HOME%\.vimrc" "%APP_PATH%\.vimrc" +call mklink "%HOME%\_vimrc" "%APP_PATH%\.vimrc" +call mklink "%HOME%\.vimrc.fork" "%APP_PATH%\.vimrc.fork" +call mklink "%HOME%\.vimrc.bundles" "%APP_PATH%\.vimrc.bundles" +call mklink "%HOME%\.vimrc.bundles.fork" "%APP_PATH%\.vimrc.bundles.fork" +call mklink "%HOME%\.vimrc.before" "%APP_PATH%\.vimrc.before" +call mklink "%HOME%\.vimrc.before.fork" "%APP_PATH%\.vimrc.before.fork" +call mklink /J "%HOME%\.vim" "%APP_PATH%\.vim" -IF NOT EXIST "%APP_DIR%\.vim\bundle" ( - call mkdir "%APP_DIR%\.vim\bundle" +IF NOT EXIST "%APP_PATH%\.vim\bundle" ( + call mkdir "%APP_PATH%\.vim\bundle" ) IF NOT EXIST "%HOME%/.vim/bundle/vundle" ( @@ -49,4 +49,4 @@ IF NOT EXIST "%HOME%/.vim/bundle/vundle" ( call cd %HOME% ) -call vim -u "%APP_DIR%/.vimrc.bundles" +BundleInstall! +BundleClean +qall +call vim -u "%APP_PATH%/.vimrc.bundles" +BundleInstall! +BundleClean +qall diff --git a/spf13-vim-windows-xp-install.cmd b/spf13-vim-windows-xp-install.cmd index c3b9da2..6b7a3b5 100644 --- a/spf13-vim-windows-xp-install.cmd +++ b/spf13-vim-windows-xp-install.cmd @@ -15,9 +15,9 @@ REM limitations under the License. @if not exist "%HOME%" @set HOME=%HOMEDRIVE%%HOMEPATH% @if not exist "%HOME%" @set HOME=%USERPROFILE% -@set APP_DIR=%HOME%\.spf13-vim-3 +@set APP_PATH=%HOME%\.spf13-vim-3 -@if not exist "%APP_DIR%" ( +@if not exist "%APP_PATH%" ( echo backing up existing vim config @set today=%DATE% @if exist "%HOME%\.vim" call xcopy /s/e/h/y/r/q/i "%HOME%\.vim" "%HOME%\.vim.%today%" @@ -26,25 +26,25 @@ REM limitations under the License. @if exist "%HOME%\.gvimrc" call copy "%HOME%\.gvimrc" "%HOME%\.gvimrc.%today%" ) -@if exist "%APP_DIR%" ( +@if exist "%APP_PATH%" ( @set ORIGINAL_DIR=%CD% echo updating spf13-vim - chdir /d "%APP_DIR%" && git pull + chdir /d "%APP_PATH%" && git pull chdir /d "%ORIGINAL_DIR%" ) else ( echo cloning spf13-vim - call git clone -b 3.0 git://github.com/spf13/spf13-vim.git "%APP_DIR%" + call git clone -b 3.0 git://github.com/spf13/spf13-vim.git "%APP_PATH%" ) -@if not exist "%APP_DIR%\.vim\bundle" call mkdir "%APP_DIR%\.vim\bundle" -call xcopy /s/e/h/y/r/q/i "%APP_DIR%\.vim" "%HOME%\.vim" -call copy "%APP_DIR%\.vimrc" "%HOME%\.vimrc" -call copy "%APP_DIR%\.vimrc" "%HOME%\_vimrc" -call copy "%APP_DIR%\.vimrc.fork" "%HOME%\.vimrc.fork" -call copy "%APP_DIR%\.vimrc.bundles" "%HOME%\.vimrc.bundles" -call copy "%APP_DIR%\.vimrc.bundles.fork" "%HOME%\.vimrc.bundles.fork" -call copy "%APP_DIR%\.vimrc.before" "%HOME%\.vimrc.before" -call copy "%APP_DIR%\.vimrc.before.fork" "%HOME%\.vimrc.before.fork" +@if not exist "%APP_PATH%\.vim\bundle" call mkdir "%APP_PATH%\.vim\bundle" +call xcopy /s/e/h/y/r/q/i "%APP_PATH%\.vim" "%HOME%\.vim" +call copy "%APP_PATH%\.vimrc" "%HOME%\.vimrc" +call copy "%APP_PATH%\.vimrc" "%HOME%\_vimrc" +call copy "%APP_PATH%\.vimrc.fork" "%HOME%\.vimrc.fork" +call copy "%APP_PATH%\.vimrc.bundles" "%HOME%\.vimrc.bundles" +call copy "%APP_PATH%\.vimrc.bundles.fork" "%HOME%\.vimrc.bundles.fork" +call copy "%APP_PATH%\.vimrc.before" "%HOME%\.vimrc.before" +call copy "%APP_PATH%\.vimrc.before.fork" "%HOME%\.vimrc.before.fork" @if not exist "%HOME%/.vim/bundle/vundle" call git clone https://github.com/gmarik/vundle.git "%HOME%/.vim/bundle/vundle" -call vim -u "%APP_DIR%/.vimrc.bundles" - +BundleInstall! +BundleClean +qall +call vim -u "%APP_PATH%/.vimrc.bundles" - +BundleInstall! +BundleClean +qall