diff options
| author |   Stephane Desneux <stephane.desneux@iot.bzh> | 2016-11-30 22:07:57 +0100 |
|---|---|---|
| committer | Stephane Desneux <stephane.desneux@iot.bzh> | 2016-11-30 22:07:57 +0100 |
| commit | 7417e97927e5a06dddb3d2166e5ccc06a1a16aae (patch) | |
| tree | fbcda3d7d5536d0865448bc18969f2cdcf1e134e | |
| parent | 6643e51c254d2dfed65f03568d1ce11e000f01c3 (diff) | |
add some fixes
Change-Id: Id1fdc6ae4f281bcae820acd51f44b37bc390742f
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
| -rw-r--r-- | Makefile | 1 | ||||
| -rwxr-xr-x | docker/setup_image.sh | 10 | ||||
| -rw-r--r-- | setup.d/20_worker_base | 2 | ||||
| -rwxr-xr-x | setup.d/30_tools | 2 |
4 files changed, 6 insertions, 9 deletions
@@ -79,7 +79,6 @@ build: test: docker run \ --detach=true \ - --net=none \ --hostname=$(CNAME) \ --name=$(CNAME) \ --privileged \ diff --git a/docker/setup_image.sh b/docker/setup_image.sh index 77a35da..56cdc1d 100755 --- a/docker/setup_image.sh +++ b/docker/setup_image.sh @@ -76,12 +76,12 @@ ln -sf ../usr/share/zoneinfo/$TIMEZONE /etc/localtime ################################## run other scripts in turn ############## -for x in $INSTDIR/setup.d/*; do - case $(basename $x) in +for script in $INSTDIR/setup.d/*; do + case $(basename $script) in [0-9][0-9]_*) - echo "--------------------- start script $x ---------------------" - . $x - echo "--------------------- end of script $x ---------------------" + echo "--------------------- start script $script ---------------------" + . $script + echo "--------------------- end of script $script ---------------------" ;; *) ;; diff --git a/setup.d/20_worker_base b/setup.d/20_worker_base index 0a3b614..eef5639 100644 --- a/setup.d/20_worker_base +++ b/setup.d/20_worker_base @@ -6,8 +6,6 @@ apt-get install -y gawk wget git git-core diffstat unzip texinfo gcc-multilib bu # add some cool base tools apt-get install -y vim-gtk man tree xz-utils tar -false # TODO - break here - # for gerrit apt-get install -y git-review gitg diff --git a/setup.d/30_tools b/setup.d/30_tools index 0fde833..486daba 100755 --- a/setup.d/30_tools +++ b/setup.d/30_tools @@ -3,7 +3,7 @@ apt-get install -y python-lzma python-gpgme pbzip2 pigz lzop dpkg -i \ - $INSTDIR/bmap-tools/bmap-tools*.deb + $INSTDIR/tools/bmaptools/bmap-tools*.deb mkdir -p /usr/local/bin for x in $INSTDIR/tools/scripts/*; do |