external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

sourcing of iiab.env moved up for upgrades; indenting cleanup

Browse source
This commit is contained in:
A Holt 2018-04-28 12:27:32 -04:00 • committed by GitHub
parent 3c3a481a11
commit 3648753210
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

31
scripts/local_facts.fact
View file

@ -1,4 +1,14 @@
#!/bin/bash #!/bin/bash
# upgrades return found, clean installs return 0
# interruptions return last stage number recorded (1-9)
if [ -f /etc/iiab/iiab.env ]; then
source /etc/iiab/iiab.env
STAGE=$STAGE
else
STAGE=0
fi
OS=`grep ^ID= /etc/*elease|cut -d= -f2` OS=`grep ^ID= /etc/*elease|cut -d= -f2`
OS=${OS//\"/} OS=${OS//\"/}
VERSION_ID=`grep VERSION_ID /etc/*elease | cut -d= -f2` VERSION_ID=`grep VERSION_ID /etc/*elease | cut -d= -f2`
@ -27,8 +37,7 @@ esac
BRANCH=`git rev-parse --abbrev-ref HEAD` BRANCH=`git rev-parse --abbrev-ref HEAD`
COMMIT=`git rev-parse --verify HEAD` COMMIT=`git rev-parse --verify HEAD`
if [ -d /usr/lib64/php ] if [ -d /usr/lib64/php ]; then
then
PHPLIB_DIR=/usr/lib64/php PHPLIB_DIR=/usr/lib64/php
else else
if [ -d /usr/lib/php5 ]; then if [ -d /usr/lib/php5 ]; then
@ -38,32 +47,20 @@ else
fi fi
fi fi
if [ -f /proc/device-tree/mfg-data/MN ] if [ -f /proc/device-tree/mfg-data/MN ]; then
then
XO_VERSION=`cat /proc/device-tree/mfg-data/MN` XO_VERSION=`cat /proc/device-tree/mfg-data/MN`
else else
XO_VERSION="none" XO_VERSION="none"
fi fi
# upgrades return found, clean installs return 0
# interruptions return last stage number recorded (1-9)
if [ -f /etc/iiab/iiab.env ]
then
source /etc/iiab/iiab.env
STAGE=$STAGE
else
STAGE=0
fi
ANSIBLE_VERSION=$(ansible --version|head -n 1|cut -f 2 -d " ") ANSIBLE_VERSION=$(ansible --version|head -n 1|cut -f 2 -d " ")
if [ ! x$DHCPCD_PATH = x ] if [ ! x$DHCPCD_PATH = x ]; then
then
DHCPCD=`systemctl is-enabled dhcpcd` DHCPCD=`systemctl is-enabled dhcpcd`
fi fi
# the check is debian family only is_redhad would use NetworkManager as the # the check is debian family only is_redhad would use NetworkManager as the
# service name. # service name.
if [ ! x$NM_PATH = x ] if [ ! x$NM_PATH = x ]; then
then
NM=`systemctl is-enabled network-manager` NM=`systemctl is-enabled network-manager`
fi fi
SYSD_NETD=`systemctl is-enabled systemd-networkd` SYSD_NETD=`systemctl is-enabled systemd-networkd`