Merge pull request #79 from qur/master

Fix building on Ubuntu
This commit is contained in:
Mitchell Hashimoto 2013-06-30 07:57:22 -07:00
commit feb092eb9c
2 changed files with 7 additions and 7 deletions

View File

@ -1,7 +1,7 @@
NO_COLOR=\x1b[0m NO_COLOR=\033[0m
OK_COLOR=\x1b[32;01m OK_COLOR=\033[32;01m
ERROR_COLOR=\x1b[31;01m ERROR_COLOR=\033[31;01m
WARN_COLOR=\x1b[33;01m WARN_COLOR=\033[33;01m
all: all:
@mkdir -p bin/ @mkdir -p bin/

View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
set -e set -e
NO_COLOR="\x1b[0m" NO_COLOR="\x1b[0m"
@ -15,12 +15,12 @@ DIR="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )"
cd $DIR cd $DIR
# Compile the main Packer app # Compile the main Packer app
echo "${OK_COLOR}--> Compiling Packer${NO_COLOR}" echo -e "${OK_COLOR}--> Compiling Packer${NO_COLOR}"
go build -v -o bin/packer . go build -v -o bin/packer .
# Go over each plugin and build it # Go over each plugin and build it
for PLUGIN in $(find ./plugin -mindepth 1 -maxdepth 1 -type d); do for PLUGIN in $(find ./plugin -mindepth 1 -maxdepth 1 -type d); do
PLUGIN_NAME=$(basename ${PLUGIN}) PLUGIN_NAME=$(basename ${PLUGIN})
echo "${OK_COLOR}--> Compiling Plugin: ${PLUGIN_NAME}${NO_COLOR}" echo -e "${OK_COLOR}--> Compiling Plugin: ${PLUGIN_NAME}${NO_COLOR}"
go build -v -o bin/packer-${PLUGIN_NAME} ${PLUGIN} go build -v -o bin/packer-${PLUGIN_NAME} ${PLUGIN}
done done