cyplo/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Windows upgrade fix (#116)

Browse source
This commit is contained in:
Cyryl Płotnicki 2017-05-14 13:05:54 +01:00 committed by GitHub
parent a4b93bf583
commit e84bd54150
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/configure_fresh_system.sh
View file

@ -162,8 +162,10 @@ if [[ -z $NOVIM ]]; then
git pull git pull
git submodule update --init --recursive git submodule update --init --recursive
fi fi
echo "Installing fzf" if [[ -z $NO_GO ]]; then
~/.fzf/install --64 --all echo "Installing fzf"
~/.fzf/install --64 --all
fi
echo "Installing Vim plugins" echo "Installing Vim plugins"
echo "\n" | vim +PluginInstall! +qa echo "\n" | vim +PluginInstall! +qa

5
windows/build.bat
View file

@ -4,7 +4,7 @@ choco upgrade -y all
call refreshenv call refreshenv
wget -c https://cygwin.com/setup-x86_64.exe wget -c https://cygwin.com/setup-x86_64.exe
setup-x86_64.exe -R "C:\cygwin64" -s http://mirror.switch.ch/ftp/mirror/cygwin/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang,cmake,clang,gcc,gcc-g++,lua,perl,the_silver_searcher,gnupg,patch,zlib-devel,openssl-devel,libyaml-devel,libyaml0_2,sqlite3,make,libtool,autoconf,automake,bison,m4,mingw64-i686-gcc-core,mingw64-x86_64-gcc-core,patch,cygwin32-readline,libcrypt-devel,libcrypt0,ncurses,libncurses-devel,python-devel,libxslt,libxslt-devel,libjpeg-devel setup-x86_64.exe -R "C:\cygwin64" -s http://mirror.switch.ch/ftp/mirror/cygwin/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang,cmake,clang,gcc,gcc-g++,lua,perl,the_silver_searcher,gnupg,patch,zlib-devel,openssl-devel,libyaml-devel,libyaml0_2,sqlite3,make,libtool,autoconf,automake,bison,m4,mingw64-i686-gcc-core,mingw64-x86_64-gcc-core,patch,cygwin32-readline,libcrypt-devel,libcrypt0,ncurses,libncurses-devel,python-devel,libxslt,libxslt-devel,libjpeg-devel,python
set script_path=%~dp0 set script_path=%~dp0
set repo_path=%script_path%\..\ set repo_path=%script_path%\..\
@ -16,8 +16,11 @@ set bash=c:\cygwin64\bin\bash.exe --login -c
for /f "delims=" %%A in ('%bash% "cd `cygpath $HOMEPATH`/dev/dotfiles && git rev-parse --abbrev-ref HEAD"') do set "branch=%%A" for /f "delims=" %%A in ('%bash% "cd `cygpath $HOMEPATH`/dev/dotfiles && git rev-parse --abbrev-ref HEAD"') do set "branch=%%A"
%bash% 'echo "branch is $branch"' %bash% 'echo "branch is $branch"'
if %errorlevel% neq 0 exit /b %errorlevel%
%bash% "cp -vr `cygpath $HOMEPATH`/.ssh $HOME/" %bash% "cp -vr `cygpath $HOMEPATH`/.ssh $HOME/"
if %errorlevel% neq 0 exit /b %errorlevel%
%bash% "export OUTER_CLONE=`cygpath $repo_path` && $script_path/build_insider.sh" %bash% "export OUTER_CLONE=`cygpath $repo_path` && $script_path/build_insider.sh"
if %errorlevel% neq 0 exit /b %errorlevel%
echo Configuring Windows-specific settings echo Configuring Windows-specific settings
echo %repo_path% is repo path echo %repo_path% is repo path