From 471f6dfdfd7da71995946dd20f8a9b8a7b7c91dd Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki Date: Tue, 1 Nov 2016 13:42:41 +0100 Subject: [PATCH 01/36] Rename windows bootstrapping directory --- .gitignore | 2 ++ {windows_cygwin => windows}/.minttyrc | 0 {windows_cygwin => windows}/README.md | 0 {windows_cygwin => windows}/bootstrap.ps1 | 0 {windows_cygwin => windows}/build.bat | 2 +- {windows_cygwin => windows}/build_insider.sh | 0 6 files changed, 3 insertions(+), 1 deletion(-) rename {windows_cygwin => windows}/.minttyrc (100%) rename {windows_cygwin => windows}/README.md (100%) rename {windows_cygwin => windows}/bootstrap.ps1 (100%) rename {windows_cygwin => windows}/build.bat (93%) mode change 100755 => 100644 rename {windows_cygwin => windows}/build_insider.sh (100%) mode change 100755 => 100644 diff --git a/.gitignore b/.gitignore index d3ddc045..1b2ca5e4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ .vim/.netrwhist .vim/bundle/* !.vim/bundle/Vundle.vim +setup*.exe +*mirror*cygwin*/ diff --git a/windows_cygwin/.minttyrc b/windows/.minttyrc similarity index 100% rename from windows_cygwin/.minttyrc rename to windows/.minttyrc diff --git a/windows_cygwin/README.md b/windows/README.md similarity index 100% rename from windows_cygwin/README.md rename to windows/README.md diff --git a/windows_cygwin/bootstrap.ps1 b/windows/bootstrap.ps1 similarity index 100% rename from windows_cygwin/bootstrap.ps1 rename to windows/bootstrap.ps1 diff --git a/windows_cygwin/build.bat b/windows/build.bat old mode 100755 new mode 100644 similarity index 93% rename from windows_cygwin/build.bat rename to windows/build.bat index 500e58d8..93b04b91 --- a/windows_cygwin/build.bat +++ b/windows/build.bat @@ -1,5 +1,5 @@ @echo on -choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5 ruby nodejs.install stylecop +choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5 ruby nodejs.install stylecop conemu dejavufonts call refreshenv wget -c https://cygwin.com/setup-x86_64.exe diff --git a/windows_cygwin/build_insider.sh b/windows/build_insider.sh old mode 100755 new mode 100644 similarity index 100% rename from windows_cygwin/build_insider.sh rename to windows/build_insider.sh From 0a219e0db4d8fe91497b04017d6540b8c433cb61 Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki Date: Tue, 1 Nov 2016 13:54:49 +0100 Subject: [PATCH 02/36] Fix path to the bootstrapper in the README doc --- windows/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/README.md b/windows/README.md index cc3c8bb3..0e0e215b 100644 --- a/windows/README.md +++ b/windows/README.md @@ -1,6 +1,6 @@ Bootstrap from cmd.exe running as Administrator: - @powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/cyplo/dotfiles/master/windows_cygwin/bootstrap.ps1'))" + @powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/cyplo/dotfiles/master/windows/bootstrap.ps1'))" launch a normal user's cmd.exe and: @@ -15,5 +15,5 @@ launch a normal user's cmd.exe and: launch new cmd.exe as Administrator and: cd %HOMEPATH%\dev\dotfiles - windows_cygwin\build.bat + windows\build.bat From d3ffdbcbd0fe6c2da5342876cbe783f94106825c Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki Date: Tue, 1 Nov 2016 14:02:38 +0100 Subject: [PATCH 03/36] Add more lightweigth tools instead of full VS suite --- windows/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/build.bat b/windows/build.bat index 93b04b91..71510c65 100644 --- a/windows/build.bat +++ b/windows/build.bat @@ -1,5 +1,5 @@ @echo on -choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5 ruby nodejs.install stylecop conemu dejavufonts +choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode p4merge dotnet4.5 ruby nodejs.install stylecop conemu dejavufonts ag call refreshenv wget -c https://cygwin.com/setup-x86_64.exe From b3d461fe1fe80013e0c68dfe519b8700e6d78fe8 Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki Date: Tue, 1 Nov 2016 14:05:03 +0100 Subject: [PATCH 04/36] Fix paths in appveyor build --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 58c4c013..8e792dbd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,2 +1,2 @@ -install: powershell -NoProfile -ExecutionPolicy Bypass -Command "windows_cygwin\bootstrap.ps1" -build_script: windows_cygwin\build.bat +install: powershell -NoProfile -ExecutionPolicy Bypass -Command "windows\bootstrap.ps1" +build_script: windows\build.bat From 8790efe8565a0b1eb9268aebf9ce0797d7c2b9b0 Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki Date: Tue, 1 Nov 2016 14:22:07 +0100 Subject: [PATCH 05/36] More verbostiy and sensitivity to errors in the installation scripts --- .vimrc.common.epilogue | 6 +++++- common/configure_fresh_system | 7 +++++++ windows/build_insider.sh | 3 +++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.vimrc.common.epilogue b/.vimrc.common.epilogue index ee21d921..178bdf81 100644 --- a/.vimrc.common.epilogue +++ b/.vimrc.common.epilogue @@ -9,7 +9,11 @@ set t_Co=256 syntax enable set background=dark highlight clear SignColumn -colorscheme solarized +try + colorscheme solarized +catch /^Vim\%((\a\+)\)\=:E185/ + colorscheme desert +endtry " plugins: airline let g:bufferline_echo = 0 diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 5221339b..011f0f88 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -118,9 +118,13 @@ if [[ -z $NOVIM ]]; then git pull git submodule update --init --recursive fi + echo "Installing fzf" ~/.fzf/install --64 --all + echo "Installing Vim plugins" echo "\n" | vim +PluginInstall +qa + if [[ -z $NOYCM ]]; then + "Echo configuring YouCompleteMe" cd ~/.vim/bundle/YouCompleteMe if [[ -z $NOPYTHON3 ]]; then @@ -139,8 +143,10 @@ if [[ -z $NO_GO ]]; then go get -u github.com/exercism/cli/exercism fi +echo "Installing Reveal-md" # talks: reveal-md $SUDO npm install -g reveal-md +echo "Installing fancy differ" $SUDO npm install -g diff-so-fancy if [[ -z $NOPYTHON3 ]]; then @@ -149,6 +155,7 @@ else PIP=pip fi +echo "Installing Nikola" $SUDO $PIP install pygments-style-solarized ws4py watchdog webassets Nikola if [[ -z $USER ]]; then diff --git a/windows/build_insider.sh b/windows/build_insider.sh index 976f703e..26c9859b 100644 --- a/windows/build_insider.sh +++ b/windows/build_insider.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -e + DOTFILES_PATH="$HOME/dev/dotfiles" mkdir -pv $HOME/dev/ rm -fr $DOTFILES_PATH @@ -26,5 +28,6 @@ ln -vfs $DIR/.gitconfig.cygwin $HOME/.gitconfig ln -vfs $DIR/.vimrc.cygwin $HOME/.vimrc # reinstall plugins with the new vimrc +echo "Reinstalling Vim plugins with the correct plugin list" echo "\n" | vim +PluginInstall +qa From 386212b8728f7187735e3203e0ed95f66ffadc29 Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki Date: Tue, 1 Nov 2016 14:35:53 +0100 Subject: [PATCH 06/36] Use gpg isntead of gpg2 when necessary --- common/configure_fresh_system | 15 ++++++++++++++- windows/build_insider.sh | 8 +++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 011f0f88..9669f730 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -105,8 +105,21 @@ set +e set -e fi +set +e +echo "Querying for gpg2 path" +gpg2_path=`which gpg2` +echo "Got $gpg2_path for gpg2 path" +echo set -e +if [[ -x gpg2_path ]]; then + echo "Using gpg2" + GPG=gpg2 +else + echo "WARNING using gpg instead of gpg2" + GPG=gpg +fi + if [[ -z $NORUBY ]]; then - gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 + $GPG --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 curl -sSL https://get.rvm.io | bash -s stable --ruby fi diff --git a/windows/build_insider.sh b/windows/build_insider.sh index 26c9859b..6a6fc74c 100644 --- a/windows/build_insider.sh +++ b/windows/build_insider.sh @@ -4,17 +4,19 @@ set -e DOTFILES_PATH="$HOME/dev/dotfiles" mkdir -pv $HOME/dev/ -rm -fr $DOTFILES_PATH -git clone "$OUTER_CLONE" "$DOTFILES_PATH" +if [[ ! -d $DOTFILES_PATH ]]; then + git clone "$OUTER_CLONE" "$DOTFILES_PATH" +fi + cd "$DOTFILES_PATH" git remote set-url origin git@github.com:cyplo/dotfiles.git git checkout $branch +git pull export NOSUDO=true export DONT_CHANGE_SHELL=true export NORUST=true -export NORUBY=true export NO_GO=true export DIR=$DOTFILES_PATH export NOYCM=true From 29858e8052891eef250691018cae6590c6d6eff8 Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki Date: Tue, 1 Nov 2016 14:38:20 +0100 Subject: [PATCH 07/36] Fail the build on no gpg whatsoever --- common/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 9669f730..ff81d206 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -109,7 +109,7 @@ set +e echo "Querying for gpg2 path" gpg2_path=`which gpg2` echo "Got $gpg2_path for gpg2 path" -echo set -e +set -e if [[ -x gpg2_path ]]; then echo "Using gpg2" GPG=gpg2 From 70a8bd01a138fe3d3f347c866fcd403d6cd5b8f9 Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki Date: Tue, 1 Nov 2016 14:38:31 +0100 Subject: [PATCH 08/36] Add gpg to cygwin --- windows/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/build.bat b/windows/build.bat index 71510c65..a8c22f54 100644 --- a/windows/build.bat +++ b/windows/build.bat @@ -3,7 +3,7 @@ choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus call refreshenv 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,lua,perl,the_silver_searcher +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,lua,perl,the_silver_searcher,gnupg set script_path=%~dp0 set repo_path=%script_path%\..\ From a514bd5278b2e49aa2f3c4cb5c2ffbc50d0b5115 Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki Date: Tue, 1 Nov 2016 14:58:13 +0100 Subject: [PATCH 09/36] Add rvm dependencies to cygwin --- windows/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/build.bat b/windows/build.bat index a8c22f54..92c1b061 100644 --- a/windows/build.bat +++ b/windows/build.bat @@ -3,7 +3,7 @@ choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus call refreshenv 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,lua,perl,the_silver_searcher,gnupg +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,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 set script_path=%~dp0 set repo_path=%script_path%\..\ From 15d738220701d1c7f20c55a1b94586384df4c519 Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki Date: Tue, 1 Nov 2016 15:04:54 +0100 Subject: [PATCH 10/36] Allow for initial key improt for rvm to fail --- common/configure_fresh_system | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index ff81d206..5f9f88ed 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -119,6 +119,9 @@ else fi if [[ -z $NORUBY ]]; then + set +e + $GPG --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 + set -e $GPG --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 curl -sSL https://get.rvm.io | bash -s stable --ruby fi From eead27ea4cf1fa80086cbfe7bda60d579902a164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Tue, 1 Nov 2016 18:24:18 +0100 Subject: [PATCH 11/36] Do not fail on lack of secret git keys --- windows/build_insider.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/windows/build_insider.sh b/windows/build_insider.sh index 6a6fc74c..b38ee69b 100644 --- a/windows/build_insider.sh +++ b/windows/build_insider.sh @@ -10,10 +10,17 @@ if [[ ! -d $DOTFILES_PATH ]]; then fi cd "$DOTFILES_PATH" -git remote set-url origin git@github.com:cyplo/dotfiles.git git checkout $branch + +git remote set-url origin https://github.com/cyplo/dotfiles.git git pull +git remote set-url origin git@github.com:cyplo/dotfiles.git +# might fail on CI where there are no secret keys +set +e +git pull +set -e + export NOSUDO=true export DONT_CHANGE_SHELL=true export NORUST=true From 6f6df6e32ad370c980ae6a21cd15190f3151e7ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Tue, 1 Nov 2016 18:38:14 +0100 Subject: [PATCH 12/36] Fix typo in the common script --- common/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 5f9f88ed..925f6f44 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -140,7 +140,7 @@ if [[ -z $NOVIM ]]; then echo "\n" | vim +PluginInstall +qa if [[ -z $NOYCM ]]; then - "Echo configuring YouCompleteMe" + echo "configuring YouCompleteMe" cd ~/.vim/bundle/YouCompleteMe if [[ -z $NOPYTHON3 ]]; then From cd16c7071a896d8f5bbefdc8314481901c3923dc Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki Date: Tue, 1 Nov 2016 19:23:13 +0100 Subject: [PATCH 13/36] Expose cygwin's setup.exe to enable RVM's requirements check --- windows/build_insider.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/windows/build_insider.sh b/windows/build_insider.sh index b38ee69b..42b4432f 100644 --- a/windows/build_insider.sh +++ b/windows/build_insider.sh @@ -31,6 +31,9 @@ export NOYCM=true curl https://bootstrap.pypa.io/get-pip.py > /tmp/get-pip.py python /tmp/get-pip.py +# expose all the binaries fetched during the outer build +export PATH="$OUTER_CLONE:$PATH" + $DIR/common/configure_fresh_system ln -vfs $DIR/windows_cygwin/.minttyrc $HOME/ ln -vfs $DIR/.gitconfig.cygwin $HOME/.gitconfig From eb731f79ab62726fbcc55438cf1761355d897fbc Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki Date: Tue, 1 Nov 2016 19:43:22 +0100 Subject: [PATCH 14/36] Add RVM dependencies under cygwin --- windows/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/build.bat b/windows/build.bat index 92c1b061..9d385297 100644 --- a/windows/build.bat +++ b/windows/build.bat @@ -3,7 +3,7 @@ choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus call refreshenv 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,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 +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,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 set script_path=%~dp0 set repo_path=%script_path%\..\ From bdce1f78cc0bde280f1dcdf99db2a91e1cffdaf4 Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki Date: Tue, 1 Nov 2016 20:14:18 +0100 Subject: [PATCH 15/36] Use RVM's Ruby under cygwin, to build fzf --- common/configure_fresh_system | 1 + windows/build.bat | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 925f6f44..d933e562 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -124,6 +124,7 @@ if [[ -z $NORUBY ]]; then set -e $GPG --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 curl -sSL https://get.rvm.io | bash -s stable --ruby + source ~/.rvm/scripts/rvm fi if [[ -z $NOVIM ]]; then diff --git a/windows/build.bat b/windows/build.bat index 9d385297..ed996894 100644 --- a/windows/build.bat +++ b/windows/build.bat @@ -1,5 +1,5 @@ @echo on -choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode p4merge dotnet4.5 ruby nodejs.install stylecop conemu dejavufonts ag +choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode p4merge dotnet4.5 nodejs.install conemu dejavufonts ag call refreshenv wget -c https://cygwin.com/setup-x86_64.exe From 316de7048e10febf6f959d1445769fa0b961aa2c Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki Date: Tue, 1 Nov 2016 20:50:10 +0100 Subject: [PATCH 16/36] Install golang on windows, as needed by fzf --- windows/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/build.bat b/windows/build.bat index ed996894..b22739d5 100644 --- a/windows/build.bat +++ b/windows/build.bat @@ -1,5 +1,5 @@ @echo on -choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode p4merge dotnet4.5 nodejs.install conemu dejavufonts ag +choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode p4merge dotnet4.5 nodejs.install conemu dejavufonts ag golang call refreshenv wget -c https://cygwin.com/setup-x86_64.exe From be31f8d3ef1c174488e1bf8b5a4969a47c4ca501 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Wed, 2 Nov 2016 20:42:28 +0100 Subject: [PATCH 17/36] Allow for failures in refreshing RVM environments --- common/configure_fresh_system | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index d933e562..9508dd9c 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -124,7 +124,10 @@ if [[ -z $NORUBY ]]; then set -e $GPG --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 curl -sSL https://get.rvm.io | bash -s stable --ruby + set +e + source /usr/local/rvm/scripts/rvm source ~/.rvm/scripts/rvm + set -e fi if [[ -z $NOVIM ]]; then From 6f5e9cf2041e696ef6fe53b1043683983ee61a8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 3 Nov 2016 07:18:10 +0100 Subject: [PATCH 18/36] Use pre-release RVM in hope to fix fzf compilation issues --- common/configure_fresh_system | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 9508dd9c..ee11a226 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -127,7 +127,10 @@ if [[ -z $NORUBY ]]; then set +e source /usr/local/rvm/scripts/rvm source ~/.rvm/scripts/rvm + rvm remove 2.3.1 set -e + rvm get branch /bugfix/issue-3519 + rvm install 2.3.1 --disable-binary fi if [[ -z $NOVIM ]]; then From 0be1d24ea3df6ee06b1c2f59163f2a3109989bfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 3 Nov 2016 07:39:36 +0100 Subject: [PATCH 19/36] Use RVM from master as the cygwin patch already merged in --- common/configure_fresh_system | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index ee11a226..56fae96c 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -123,13 +123,11 @@ if [[ -z $NORUBY ]]; then $GPG --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 set -e $GPG --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 - curl -sSL https://get.rvm.io | bash -s stable --ruby + curl -sSL https://get.rvm.io | bash set +e source /usr/local/rvm/scripts/rvm source ~/.rvm/scripts/rvm - rvm remove 2.3.1 set -e - rvm get branch /bugfix/issue-3519 rvm install 2.3.1 --disable-binary fi From a30b1d564d2913ba09a7b802c1ebc44ed46c2eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 3 Nov 2016 08:53:22 +0100 Subject: [PATCH 20/36] Add dependencies needed to compile ncurses gem on cygwin --- windows/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/build.bat b/windows/build.bat index b22739d5..c6ae2245 100644 --- a/windows/build.bat +++ b/windows/build.bat @@ -3,7 +3,7 @@ choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus call refreshenv 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,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 +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,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 set script_path=%~dp0 set repo_path=%script_path%\..\ From b8218562a53cb0b8a89a9e59ca60e6d469a42255 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 3 Nov 2016 10:43:41 +0100 Subject: [PATCH 21/36] Fix branch checkout failing --- windows/build_insider.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/windows/build_insider.sh b/windows/build_insider.sh index 42b4432f..d5feb133 100644 --- a/windows/build_insider.sh +++ b/windows/build_insider.sh @@ -10,11 +10,10 @@ if [[ ! -d $DOTFILES_PATH ]]; then fi cd "$DOTFILES_PATH" -git checkout $branch - git remote set-url origin https://github.com/cyplo/dotfiles.git +git fetch -p +git checkout $branch git pull - git remote set-url origin git@github.com:cyplo/dotfiles.git # might fail on CI where there are no secret keys set +e From 70017cf7b7b26e5d6c80f02950190646aab1f55d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 3 Nov 2016 12:03:33 +0100 Subject: [PATCH 22/36] Fall back to `pip` when no `pip3` on Python3 --- common/configure_fresh_system | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 56fae96c..d6e2a2c9 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -170,7 +170,8 @@ $SUDO npm install -g reveal-md echo "Installing fancy differ" $SUDO npm install -g diff-so-fancy -if [[ -z $NOPYTHON3 ]]; then +pip3_path=`which pip3` +if [[ -z $NOPYTHON3 && -x pip3_path ]]; then PIP=pip3 else PIP=pip From 9bae0347192b91687d9edf6ffac7e3818a579848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 3 Nov 2016 20:55:20 +0100 Subject: [PATCH 23/36] Fix pip detection --- common/configure_fresh_system | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index d6e2a2c9..5695a7a6 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -170,16 +170,21 @@ $SUDO npm install -g reveal-md echo "Installing fancy differ" $SUDO npm install -g diff-so-fancy -pip3_path=`which pip3` -if [[ -z $NOPYTHON3 && -x pip3_path ]]; then - PIP=pip3 -else - PIP=pip +if [[ -z $NOPYTHON3 ]]; then + pip3_path=`which pip3` + echo "pip3 path is $pip3_path" + if [[ -x pip3_path ]]; then + echo "Choosing pip3 for pip" + PIP=pip3 + else + echo "Choosing pip" + PIP=pip + fi + echo "Installing Nikola" + $SUDO $PIP install pygments-style-solarized ws4py watchdog webassets Nikola + fi fi -echo "Installing Nikola" -$SUDO $PIP install pygments-style-solarized ws4py watchdog webassets Nikola - if [[ -z $USER ]]; then USER=`whoami` fi From bfc723b23809777fa8ca2d5f58dfb30c82c57e1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 3 Nov 2016 21:12:59 +0100 Subject: [PATCH 24/36] More verbosity around installing RVM --- common/configure_fresh_system | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 5695a7a6..2e896bc3 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -123,11 +123,14 @@ if [[ -z $NORUBY ]]; then $GPG --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 set -e $GPG --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 + echo "Downloading RVM..." curl -sSL https://get.rvm.io | bash set +e + echo "Sourcing RVM..." source /usr/local/rvm/scripts/rvm source ~/.rvm/scripts/rvm set -e + echo "Installing Ruby..." rvm install 2.3.1 --disable-binary fi From be6a6c5c6e35962fec9289d131bc456d9cd416c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 3 Nov 2016 21:18:13 +0100 Subject: [PATCH 25/36] Use previously detected curl to download RVM --- common/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 2e896bc3..2b88fa04 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -124,7 +124,7 @@ if [[ -z $NORUBY ]]; then set -e $GPG --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 echo "Downloading RVM..." - curl -sSL https://get.rvm.io | bash + $CURL https://get.rvm.io | bash set +e echo "Sourcing RVM..." source /usr/local/rvm/scripts/rvm From eb153a7ad9f77027e9b0ad1a330255b54dbdbc5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 3 Nov 2016 21:18:33 +0100 Subject: [PATCH 26/36] Do not leak branch name from the windows script --- windows/build_insider.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/windows/build_insider.sh b/windows/build_insider.sh index d5feb133..6d1fe7d0 100644 --- a/windows/build_insider.sh +++ b/windows/build_insider.sh @@ -19,6 +19,7 @@ git remote set-url origin git@github.com:cyplo/dotfiles.git set +e git pull set -e +unset branch export NOSUDO=true export DONT_CHANGE_SHELL=true From 568e1435921b2ca2c759f9f95447f75a2b6bf969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 3 Nov 2016 21:21:29 +0100 Subject: [PATCH 27/36] Follow redirects when downloading via curl --- common/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 2b88fa04..bf1937a2 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -18,7 +18,7 @@ if [[ -z $DONT_CHANGE_SHELL ]]; then chsh -s `which zsh` $USER fi -CURL="curl -sSf" +CURL="curl -sSfL" jobs_count=`nproc` if [[ -z $DIR ]]; then From b1f43c85e28f2677e20556da37a3c0edc995b204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 3 Nov 2016 21:38:04 +0100 Subject: [PATCH 28/36] Fix gpg2 and pip paths detection --- common/configure_fresh_system | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index bf1937a2..2bc25234 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -110,7 +110,7 @@ echo "Querying for gpg2 path" gpg2_path=`which gpg2` echo "Got $gpg2_path for gpg2 path" set -e -if [[ -x gpg2_path ]]; then +if [[ -x "$gpg2_path" ]]; then echo "Using gpg2" GPG=gpg2 else @@ -176,7 +176,7 @@ $SUDO npm install -g diff-so-fancy if [[ -z $NOPYTHON3 ]]; then pip3_path=`which pip3` echo "pip3 path is $pip3_path" - if [[ -x pip3_path ]]; then + if [[ -x "$pip3_path" ]]; then echo "Choosing pip3 for pip" PIP=pip3 else From d0660e84a7933af972d22447fa0a6a10e5dbfff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 3 Nov 2016 21:57:00 +0100 Subject: [PATCH 29/36] Re-link correct gitconfig --- windows/build_insider.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/build_insider.sh b/windows/build_insider.sh index 6d1fe7d0..118a6739 100644 --- a/windows/build_insider.sh +++ b/windows/build_insider.sh @@ -4,7 +4,7 @@ set -e DOTFILES_PATH="$HOME/dev/dotfiles" mkdir -pv $HOME/dev/ - +ln -vfs "$OUTER_CLONE/.gitconfig.cygwin" $HOME/.gitconfig if [[ ! -d $DOTFILES_PATH ]]; then git clone "$OUTER_CLONE" "$DOTFILES_PATH" fi @@ -36,7 +36,7 @@ export PATH="$OUTER_CLONE:$PATH" $DIR/common/configure_fresh_system ln -vfs $DIR/windows_cygwin/.minttyrc $HOME/ -ln -vfs $DIR/.gitconfig.cygwin $HOME/.gitconfig +ln -vfs "$DOTFILES_PATH/.gitconfig.cygwin" $HOME/.gitconfig ln -vfs $DIR/.vimrc.cygwin $HOME/.vimrc # reinstall plugins with the new vimrc From 9d9431f6e28a2635013acb84142ecf28f2b0a908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 3 Nov 2016 21:58:39 +0100 Subject: [PATCH 30/36] Do not fail the build if no pip3 --- common/configure_fresh_system | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 2bc25234..4885a51f 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -174,7 +174,9 @@ echo "Installing fancy differ" $SUDO npm install -g diff-so-fancy if [[ -z $NOPYTHON3 ]]; then + set +e pip3_path=`which pip3` + set -e echo "pip3 path is $pip3_path" if [[ -x "$pip3_path" ]]; then echo "Choosing pip3 for pip" From a8e07527846916fadfab9b3deffe89b6a1fd8698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 3 Nov 2016 22:09:14 +0100 Subject: [PATCH 31/36] Add python-devel, a Nikola dependency on cygwin --- windows/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/build.bat b/windows/build.bat index c6ae2245..9cb2c6f7 100644 --- a/windows/build.bat +++ b/windows/build.bat @@ -3,7 +3,7 @@ choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus call refreshenv 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,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 +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,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 set script_path=%~dp0 set repo_path=%script_path%\..\ From d57d6ad161c49778772917a921d70c131bc0f321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 3 Nov 2016 22:22:17 +0100 Subject: [PATCH 32/36] Add Nikola's dependencies on cygwin --- windows/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/build.bat b/windows/build.bat index 9cb2c6f7..b649a931 100644 --- a/windows/build.bat +++ b/windows/build.bat @@ -3,7 +3,7 @@ choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus call refreshenv 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,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 +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,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 set script_path=%~dp0 set repo_path=%script_path%\..\ From b1ce3d47e625b491714854789e23ea25a751d06c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 3 Nov 2016 22:25:47 +0100 Subject: [PATCH 33/36] Fix broken if for Nikola install --- common/configure_fresh_system | 1 - 1 file changed, 1 deletion(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 4885a51f..c5bb9f70 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -187,7 +187,6 @@ if [[ -z $NOPYTHON3 ]]; then fi echo "Installing Nikola" $SUDO $PIP install pygments-style-solarized ws4py watchdog webassets Nikola - fi fi if [[ -z $USER ]]; then From 6e105f7a09d6fde7b38b8efd019b78978509c7ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 3 Nov 2016 22:34:52 +0100 Subject: [PATCH 34/36] Add conemu settings --- conemu.xml | 700 ++++++++++++++++++++++++++++++++++++++++++++++ windows/build.bat | 2 + 2 files changed, 702 insertions(+) create mode 100644 conemu.xml diff --git a/conemu.xml b/conemu.xml new file mode 100644 index 00000000..580acd19 --- /dev/null +++ b/conemu.xml @@ -0,0 +1,700 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windows/build.bat b/windows/build.bat index b649a931..5d094a53 100644 --- a/windows/build.bat +++ b/windows/build.bat @@ -5,6 +5,8 @@ call refreshenv 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,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 +xcopy /Y conemu.xml %appdata%\Roaming\ConEmu.xml + set script_path=%~dp0 set repo_path=%script_path%\..\ set bash=c:\cygwin64\bin\bash.exe --login -c From 6d5b95e1d33347f5d7031d288a536d12922d388a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Fri, 4 Nov 2016 07:08:31 +0100 Subject: [PATCH 35/36] Use `copy` instead of `xcopy` to copy single file --- windows/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/build.bat b/windows/build.bat index 5d094a53..9860213a 100644 --- a/windows/build.bat +++ b/windows/build.bat @@ -5,7 +5,7 @@ call refreshenv 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,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 -xcopy /Y conemu.xml %appdata%\Roaming\ConEmu.xml +copy /Y conemu.xml %appdata%\Roaming\ConEmu.xml set script_path=%~dp0 set repo_path=%script_path%\..\ From 3b3a39382941f2e42c704e7bbbc1828e0e727afe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Fri, 4 Nov 2016 07:48:38 +0100 Subject: [PATCH 36/36] Do not fail on CI when not on the branch Helpful for AppVeyor's non-branch checkouts --- windows/build_insider.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/windows/build_insider.sh b/windows/build_insider.sh index 118a6739..2d6bc0f1 100644 --- a/windows/build_insider.sh +++ b/windows/build_insider.sh @@ -13,7 +13,9 @@ cd "$DOTFILES_PATH" git remote set-url origin https://github.com/cyplo/dotfiles.git git fetch -p git checkout $branch +set +e git pull +set -e git remote set-url origin git@github.com:cyplo/dotfiles.git # might fail on CI where there are no secret keys set +e