Merge pull request #2552 from dokku/build-on-osx

Build on osx
This commit is contained in:
Jose Diaz-Gonzalez
2017-01-08 05:25:45 -07:00
committed by GitHub
2 changed files with 2 additions and 2 deletions

View File

@@ -70,7 +70,7 @@ copyfiles:
chown dokku:dokku -R ${PLUGINS_PATH} ${CORE_PLUGINS_PATH} || true
$(MAKE) addman
addman: help2man
addman: help2man man-db
mkdir -p /usr/local/share/man/man1
help2man -Nh help -v version -n "configure and get information from your dokku installation" -o /usr/local/share/man/man1/dokku.1 dokku
mandb

2
dokku
View File

@@ -9,7 +9,7 @@ export DOKKU_ROOT=${DOKKU_ROOT:=~dokku}
export DOKKU_DISTRO
# shellcheck disable=SC1091
DOKKU_DISTRO=$(. /etc/os-release && echo "$ID")
DOKKU_DISTRO=$(. /etc/os-release > /dev/null 2>&1 || true ; echo "$ID")
export DOKKU_IMAGE=${DOKKU_IMAGE:="gliderlabs/herokuish"}
export DOKKU_LIB_ROOT=${DOKKU_LIB_PATH:="/var/lib/dokku"}