Use /etc/os-release that is more standartized
This commit is contained in:
17
dokku
17
dokku
@@ -7,20 +7,9 @@ export DOKKU_ROOT=${DOKKU_ROOT:=~dokku}
|
|||||||
[[ -d $DOKKU_ROOT/.dokkurc ]] && for f in $DOKKU_ROOT/.dokkurc/*; do source "$f"; done
|
[[ -d $DOKKU_ROOT/.dokkurc ]] && for f in $DOKKU_ROOT/.dokkurc/*; do source "$f"; done
|
||||||
[[ $DOKKU_TRACE ]] && set -x
|
[[ $DOKKU_TRACE ]] && set -x
|
||||||
|
|
||||||
case "$(lsb_release -si)" in
|
export DOKKU_DISTRO
|
||||||
Arch)
|
# shellcheck disable=SC1091
|
||||||
export DOKKU_DISTRO=${DOKKU_DISTRO:="arch"}
|
DOKKU_DISTRO=$(. /etc/os-release && echo "$ID")
|
||||||
;;
|
|
||||||
Debian)
|
|
||||||
export DOKKU_DISTRO=${DOKKU_DISTRO:="debian"}
|
|
||||||
;;
|
|
||||||
CentOS)
|
|
||||||
export DOKKU_DISTRO=${DOKKU_DISTRO:="centos"}
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
export DOKKU_DISTRO=${DOKKU_DISTRO:="ubuntu"}
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
export DOKKU_IMAGE=${DOKKU_IMAGE:="gliderlabs/herokuish"}
|
export DOKKU_IMAGE=${DOKKU_IMAGE:="gliderlabs/herokuish"}
|
||||||
export DOKKU_LIB_ROOT=${DOKKU_LIB_PATH:="/var/lib/dokku"}
|
export DOKKU_LIB_ROOT=${DOKKU_LIB_PATH:="/var/lib/dokku"}
|
||||||
|
|||||||
1
rpm.mk
1
rpm.mk
@@ -92,7 +92,6 @@ endif
|
|||||||
--depends 'sudo' \
|
--depends 'sudo' \
|
||||||
--depends 'python' \
|
--depends 'python' \
|
||||||
--depends 'nc' \
|
--depends 'nc' \
|
||||||
--depends 'redhat-lsb-core' \
|
|
||||||
--after-install rpm/dokku.postinst \
|
--after-install rpm/dokku.postinst \
|
||||||
--url "https://github.com/$(DOKKU_REPO_NAME)" \
|
--url "https://github.com/$(DOKKU_REPO_NAME)" \
|
||||||
--description $(DOKKU_DESCRIPTION) \
|
--description $(DOKKU_DESCRIPTION) \
|
||||||
|
|||||||
Reference in New Issue
Block a user