Use /etc/os-release that is more standartized

This commit is contained in:
Edgars Beigarts committed 2016-09-26 01:55:20 +03:00
1 parent 537906c504
commit 7bf22df7c3
2 files changed
+3 -15

No files matched your search

+3 -14
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 [[ -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
View File
@@ -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) \