Mirrors/dokku
1
0
Fork 0
mirror of https://github.com/dokku/dokku.git synced 2025-12-29 00:25:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use /etc/os-release that is more standartized

Browse Source
This commit is contained in:
Edgars Beigarts
2016-09-23 17:01:42 +03:00
parent 537906c504
commit 7bf22df7c3
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
dokku
View File

@@ -7,20 +7,9 @@ export DOKKU_ROOT=${DOKKU_ROOT:=~dokku}
[[ -d $DOKKU_ROOT/.dokkurc ]] && for f in $DOKKU_ROOT/.dokkurc/*; do source "$f"; done
[[ $DOKKU_TRACE ]] && set -x
case "$(lsb_release -si)" in
Arch)
export DOKKU_DISTRO=${DOKKU_DISTRO:="arch"}
;;
Debian)
export DOKKU_DISTRO=${DOKKU_DISTRO:="debian"}
;;
CentOS)
export DOKKU_DISTRO=${DOKKU_DISTRO:="centos"}
;;
*)
export DOKKU_DISTRO=${DOKKU_DISTRO:="ubuntu"}
;;
esac
export DOKKU_DISTRO
# shellcheck disable=SC1091
DOKKU_DISTRO=$(. /etc/os-release && echo "$ID")
export DOKKU_IMAGE=${DOKKU_IMAGE:="gliderlabs/herokuish"}
export DOKKU_LIB_ROOT=${DOKKU_LIB_PATH:="/var/lib/dokku"}

1
rpm.mk
View File

@@ -92,7 +92,6 @@ endif
--depends 'sudo' \
--depends 'python' \
--depends 'nc' \
--depends 'redhat-lsb-core' \
--after-install rpm/dokku.postinst \
--url "https://github.com/$(DOKKU_REPO_NAME)" \
--description $(DOKKU_DESCRIPTION) \