Move __hostname hostname explorer to global scope

This commit is contained in:
Dennis Camera 2019-10-03 19:19:06 +02:00
parent abc765bd99
commit 81ba849af8
3 changed files with 21 additions and 53 deletions

View file

@ -1,7 +1,6 @@
#!/bin/sh
#
# 2010-2014 Nico Schottelius (nico-cdist at schottelius.org)
# 2012 Steven Armstrong (steven-cdist at armstrong.cc)
# 2019 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
#
# This file is part of cdist.
#
@ -19,7 +18,24 @@
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
#
#
# Retrieve the running hostname
#
if command -v uname >/dev/null; then
uname -n
# Firstly, check hostnamectl if available.
if command -v hostnamectl >/dev/null
then
hostnamectl status --static && exit 0
fi
# In case hostnamectl is missing or failed:
# We fall back to alternative approaches
if [ "$(uname -s)" = Darwin ] && command -v scutil >/dev/null
then
# Mac OS X
scutil --get HostName 2>/dev/null
elif command -v hostname >/dev/null
then
hostname -s
else
uname -n
fi

View file

@ -1,48 +0,0 @@
#!/bin/sh
#
# 2019 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
#
# This file is part of cdist.
#
# cdist is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# cdist is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
#
#
# Retrieve the running hostname
#
# Firstly, check hostnamectl if available.
if command -v hostnamectl >/dev/null
then
hostnamectl --static && exit 0
fi
# Almost any distribution
if [ -f /etc/hostname ]; then
cat /etc/hostname
# SuSE
elif [ -f /etc/HOSTNAME ]; then
cat /etc/HOSTNAME
# OpenBSD
elif [ -f /etc/myname ]; then
cat /etc/myname
# FreeBSD
elif [ "$(uname -s)" == FreeBSD ]; then
(. /etc/rc.conf && echo $hostname)
# Mac OS X
elif [ "$(uname -s)" == Darwin ]; then
[ -x "$(command -v scutil)" ] && scutil --get HostName 2>/dev/null || hostname -s
else
command -v hostname && hostname -s
fi

View file

@ -18,7 +18,7 @@
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
#
#
# Retrieve the contents of /etc/hostname
# Retrieve the contents of /etc/sysconfig/network
#
if [ -f /etc/sysconfig/network ]; then