From 34155478afc15c0ff4fdeea8bb1339324f15b8b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 19 Jan 2017 10:03:34 +0000 Subject: [PATCH] Add windows debug tools (#93) --- .gitattributes | 1 - .gitconfig.cygwin | 2 +- .setenv => .setenv.sh | 0 .travis.yml | 2 +- README.md | 2 +- common/{configure_fresh_system => configure_fresh_system.sh} | 2 +- debian/{configure_fresh_system => configure_fresh_system.sh} | 2 +- debian/test_insider | 2 +- fedora/{configure_fresh_system => configure_fresh_system.sh} | 2 +- fedora/test_insider | 2 +- test => test.sh | 0 travis/{configure_fresh_system => configure_fresh_system.sh} | 2 +- ubuntu/{configure_fresh_system => configure_fresh_system.sh} | 2 +- ubuntu/test_insider | 2 +- windows/build.bat | 2 +- windows/build_insider.sh | 2 +- 16 files changed, 13 insertions(+), 14 deletions(-) rename .setenv => .setenv.sh (100%) rename common/{configure_fresh_system => configure_fresh_system.sh} (99%) rename debian/{configure_fresh_system => configure_fresh_system.sh} (97%) rename fedora/{configure_fresh_system => configure_fresh_system.sh} (98%) rename test => test.sh (100%) rename travis/{configure_fresh_system => configure_fresh_system.sh} (99%) rename ubuntu/{configure_fresh_system => configure_fresh_system.sh} (95%) diff --git a/.gitattributes b/.gitattributes index a647db34..f5d0c3cc 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,2 @@ *.sh -crlf - *.zip filter=lfs diff=lfs merge=lfs -text diff --git a/.gitconfig.cygwin b/.gitconfig.cygwin index 54c16fa8..1ce36d8d 100644 --- a/.gitconfig.cygwin +++ b/.gitconfig.cygwin @@ -1,4 +1,4 @@ [include] path = dev/dotfiles/.gitconfig_includes.common path = dev/dotfiles/.gitconfig_includes.cygwin - + diff --git a/.setenv b/.setenv.sh similarity index 100% rename from .setenv rename to .setenv.sh diff --git a/.travis.yml b/.travis.yml index 9b786712..72dde6cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: - bash script: - - ./test + - ./test.sh env: - DETECTED_OS=fedora:24 DOCKER_IMAGE=cyplo/fedora24_base diff --git a/README.md b/README.md index b26546c8..c552cc3a 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ install: cd ~/dev git clone git@github.com:cyplo/dotfiles.git cd dotfiles - ./ubuntu/configure_fresh_system + ./ubuntu/configure_fresh_system.sh # or /debian/.. or /fedora/.. GNOME extensions list: diff --git a/common/configure_fresh_system b/common/configure_fresh_system.sh similarity index 99% rename from common/configure_fresh_system rename to common/configure_fresh_system.sh index b5ad9510..919508ba 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system.sh @@ -42,7 +42,7 @@ ln -vfs "$DIR/.zprofile" ~/.zprofile ln -vfs "$DIR/.zprezto/runcoms/zshenv" ~/.zshenv ln -vfs "$DIR/.zshrc" ~/.zshrc -ln -vfs "$DIR/.setenv" ~/. +ln -vfs "$DIR/.setenv.sh" ~/.setenv ln -vfs "$DIR/.Slic3r" ~/. ln -vfs "$DIR/.ghci" ~/. ln -vfs "$DIR/.conkyrc" ~/. diff --git a/debian/configure_fresh_system b/debian/configure_fresh_system.sh similarity index 97% rename from debian/configure_fresh_system rename to debian/configure_fresh_system.sh index d19a4660..0edac37e 100755 --- a/debian/configure_fresh_system +++ b/debian/configure_fresh_system.sh @@ -50,5 +50,5 @@ fi DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$DIR/../" -DIR="$DIR" $DIR/common/configure_fresh_system +DIR="$DIR" $DIR/common/configure_fresh_system.sh diff --git a/debian/test_insider b/debian/test_insider index a0a26c6e..5f1a07e5 100755 --- a/debian/test_insider +++ b/debian/test_insider @@ -16,5 +16,5 @@ cd $HOME mkdir -p dev/ cp -rv temp/dotfiles dev/ -./dev/dotfiles/debian/configure_fresh_system +./dev/dotfiles/debian/configure_fresh_system.sh diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system.sh similarity index 98% rename from fedora/configure_fresh_system rename to fedora/configure_fresh_system.sh index 75a4f8ac..31f44761 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system.sh @@ -75,5 +75,5 @@ if [[ -z $NO_COMPILE_VIM ]]; then fi DIR="$DIR/../" -DIR="$DIR" $DIR/common/configure_fresh_system +DIR="$DIR" $DIR/common/configure_fresh_system.sh diff --git a/fedora/test_insider b/fedora/test_insider index cb64b3f9..10f7a79f 100755 --- a/fedora/test_insider +++ b/fedora/test_insider @@ -13,5 +13,5 @@ cd $HOME mkdir -p dev/ cp -rv temp/dotfiles dev/ -./dev/dotfiles/fedora/configure_fresh_system +./dev/dotfiles/fedora/configure_fresh_system.sh diff --git a/test b/test.sh similarity index 100% rename from test rename to test.sh diff --git a/travis/configure_fresh_system b/travis/configure_fresh_system.sh similarity index 99% rename from travis/configure_fresh_system rename to travis/configure_fresh_system.sh index 3d40f166..920cd437 100755 --- a/travis/configure_fresh_system +++ b/travis/configure_fresh_system.sh @@ -11,5 +11,5 @@ eval ${INSTALL_COMMAND} DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$DIR/../" -DONT_CHANGE_SHELL=TRUE DIR="$DIR" $DIR/common/configure_fresh_system +DONT_CHANGE_SHELL=TRUE DIR="$DIR" $DIR/common/configure_fresh_system.sh diff --git a/ubuntu/configure_fresh_system b/ubuntu/configure_fresh_system.sh similarity index 95% rename from ubuntu/configure_fresh_system rename to ubuntu/configure_fresh_system.sh index 76366819..830b301d 100755 --- a/ubuntu/configure_fresh_system +++ b/ubuntu/configure_fresh_system.sh @@ -22,4 +22,4 @@ fi DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$DIR/../" -DIR="$DIR" $DIR/common/configure_fresh_system +DIR="$DIR" $DIR/common/configure_fresh_system.sh diff --git a/ubuntu/test_insider b/ubuntu/test_insider index 1234fce0..f8f384f4 100755 --- a/ubuntu/test_insider +++ b/ubuntu/test_insider @@ -15,5 +15,5 @@ cd $HOME mkdir -p dev/ cp -rv temp/dotfiles dev/ -./dev/dotfiles/ubuntu/configure_fresh_system +./dev/dotfiles/ubuntu/configure_fresh_system.sh diff --git a/windows/build.bat b/windows/build.bat index 9f0ebbf3..c99d0a2e 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 golang windows-adk-all +choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode p4merge dotnet4.5 nodejs.install conemu dejavufonts ag golang wireshark procexp procmon drmemory.install WinPcap call refreshenv wget -c https://cygwin.com/setup-x86_64.exe diff --git a/windows/build_insider.sh b/windows/build_insider.sh index f56557bf..e2ab6626 100644 --- a/windows/build_insider.sh +++ b/windows/build_insider.sh @@ -40,7 +40,7 @@ python /tmp/get-pip.py # expose all the binaries fetched during the outer build export PATH="$OUTER_CLONE:$PATH" -$DIR/common/configure_fresh_system +$DIR/common/configure_fresh_system.sh ln -vfs $DIR/windows_cygwin/.minttyrc $HOME/ ln -vfs "$DOTFILES_PATH/.gitconfig.cygwin" $HOME/.gitconfig ln -vfs $DIR/.vimrc.cygwin $HOME/.vimrc