]> granicus.if.org Git - icinga2/commitdiff
Fix some of the paths for the Docker scripts.
authorGunnar Beutner <gunnar.beutner@netways.de>
Fri, 11 Apr 2014 10:30:06 +0000 (12:30 +0200)
committerGunnar Beutner <gunnar.beutner@netways.de>
Fri, 11 Apr 2014 10:30:06 +0000 (12:30 +0200)
Refs #5996

dev/clean [new file with mode: 0755]
dev/docker/build

diff --git a/dev/clean b/dev/clean
new file mode 100755 (executable)
index 0000000..07425fb
--- /dev/null
+++ b/dev/clean
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd `dirname -- $0` || exit 1
+rm -Rf .build
index fcecb85771b6616ef10600c65b1a7e342144ee99..4a34e0004752dc0b53a62c41c375c250b17ea325 100755 (executable)
@@ -6,8 +6,8 @@ fi
 
 cd
 
-cp icinga2/tools/debug/gdb/gdbinit ~/.gdbinit
-sed -i 's/home\/gbeutner/home\/icinga/' ~/.gdbinit
+cp icinga2/tools/debug/gdb/gdbinit .gdbinit
+sed -i 's/home\/gbeutner/home\/icinga/' .gdbinit
 
 cd icinga2-build || exit 1
 
@@ -15,7 +15,7 @@ CCACHE_SLOPPINESS="include_file_mtime"
 export CCACHE_SLOPPINESS
 
 if [ ! -e Makefile ]; then
-       CC="ccache clang" CXX="ccache clang++" cmake ../icinga2 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=~/icinga2-install -DCMAKE_INSTALL_SYSCONFDIR=~/icinga2-config
+       CC="ccache clang" CXX="ccache clang++" cmake ../icinga2 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$HOME/icinga2-install -DCMAKE_INSTALL_SYSCONFDIR=$HOME/icinga2-config
 fi
 
-make -j 4 && make install && cgdb -ex set scheduler-locking step -ex r --args ~/icinga2-install/sbin/icinga2 -c ~/icinga2-config/icinga2/icinga2.conf -DUseVfork=0
+make -j 4 && make install && cgdb -ex set scheduler-locking step -ex r --args ../icinga2-install/sbin/icinga2 -c ../icinga2-config/icinga2/icinga2.conf -DUseVfork=0