colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build/meson: cleanup "meson-post-install.sh"

Browse Source 
- the variables in meson.build and in the meson-post-install.sh script
  should have the same names.

- the positional command line arguments should be assigned to variables,
  because the variable name acts like a documentation what the variable
  means (contrary to the argument number).

- the boolean flags should not map to other special values, like
  "enable_docs ? 'install_docs' : ''". The name "enable_docs" is
  good already, it shall be either passed as 1 or 0 and use the name
  consistently.
This commit is contained in:
Thomas Haller
2019-11-22 15:59:11 +01:00
parent 6d7270e222
commit 21845ae4e3
2 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@@ -906,10 +906,10 @@ meson.add_install_script(
nm_pkgconfdir, nm_pkgconfdir,
nm_pkglibdir, nm_pkglibdir,
nm_pkgstatedir, nm_pkgstatedir,
enable_docs ? 'install_docs' : '',
nm_mandir, nm_mandir,
enable_ifcfg_rh ? 'create_network_scripts' : '',
nm_sysconfdir, nm_sysconfdir,
enable_docs ? '1' : '0',
enable_ifcfg_rh ? '1' : '0',
) )
output = '\nSystem paths:\n' output = '\nSystem paths:\n'

68
tools/meson-post-install.sh
View File

@@ -1,55 +1,57 @@
#!/bin/sh #!/bin/sh
datadir=$1 nm_datadir="$1"
bindir=$2 nm_bindir="$2"
pkgconfdir=$3 nm_pkgconfdir="$3"
pkglibdir=$4 nm_pkglibdir="$4"
pkgstatedir=$5 nm_pkgstatedir="$5"
nm_mandir="$6"
nm_sysconfdir="$7"
enable_docs="$8"
enable_ifcfg_rh="$9"
[ -n "$DESTDIR" ] && DESTDIR=${DESTDIR%%/}/ [ -n "$DESTDIR" ] && DESTDIR="${DESTDIR%%/}/"
if [ -f "${DESTDIR}${datadir}/bash-completion/completions/nmcli-completion" ]; then if [ -f "${DESTDIR}${nm_datadir}/bash-completion/completions/nmcli-completion" ]; then
mv "${DESTDIR}${datadir}/bash-completion/completions/nmcli-completion" \ mv "${DESTDIR}${nm_datadir}/bash-completion/completions/nmcli-completion" \
"${DESTDIR}${datadir}/bash-completion/completions/nmcli" "${DESTDIR}${nm_datadir}/bash-completion/completions/nmcli"
fi fi
if [ -x "${DESTDIR}${bindir}/nmtui" ]; then if [ -x "${DESTDIR}${nm_bindir}/nmtui" ]; then
for alias in nmtui-connect nmtui-edit nmtui-hostname; do for alias in nmtui-connect nmtui-edit nmtui-hostname; do
ln -sf nmtui "${DESTDIR}${bindir}/$alias" ln -sf nmtui "${DESTDIR}${nm_bindir}/$alias"
done done
fi fi
for dir in "${pkgconfdir}/conf.d" \ for dir in "${nm_pkgconfdir}/conf.d" \
"${pkgconfdir}/system-connections" \ "${nm_pkgconfdir}/system-connections" \
"${pkgconfdir}/dispatcher.d/no-wait.d" \ "${nm_pkgconfdir}/dispatcher.d/no-wait.d" \
"${pkgconfdir}/dispatcher.d/pre-down.d" \ "${nm_pkgconfdir}/dispatcher.d/pre-down.d" \
"${pkgconfdir}/dispatcher.d/pre-up.d" \ "${nm_pkgconfdir}/dispatcher.d/pre-up.d" \
"${pkgconfdir}/dnsmasq.d" \ "${nm_pkgconfdir}/dnsmasq.d" \
"${pkgconfdir}/dnsmasq-shared.d" \ "${nm_pkgconfdir}/dnsmasq-shared.d" \
"${pkglibdir}/conf.d" \ "${nm_pkglibdir}/conf.d" \
"${pkglibdir}/dispatcher.d/no-wait.d" \ "${nm_pkglibdir}/dispatcher.d/no-wait.d" \
"${pkglibdir}/dispatcher.d/pre-down.d" \ "${nm_pkglibdir}/dispatcher.d/pre-down.d" \
"${pkglibdir}/dispatcher.d/pre-up.d" \ "${nm_pkglibdir}/dispatcher.d/pre-up.d" \
"${pkglibdir}/system-connections" \ "${nm_pkglibdir}/system-connections" \
"${pkglibdir}/VPN"; do "${nm_pkglibdir}/VPN"; do
mkdir -p "${DESTDIR}${dir}" mkdir -p "${DESTDIR}${dir}"
chmod 0755 "${DESTDIR}${dir}" chmod 0755 "${DESTDIR}${dir}"
done done
mkdir -p "${DESTDIR}${pkgstatedir}" mkdir -p "${DESTDIR}${nm_pkgstatedir}"
chmod 0700 "${DESTDIR}${pkgstatedir}" chmod 0700 "${DESTDIR}${nm_pkgstatedir}"
if [ "$6" = install_docs ]; then if [ "$enable_docs" = 1 ]; then
mandir=$7
for alias in nmtui-connect nmtui-edit nmtui-hostname; do for alias in nmtui-connect nmtui-edit nmtui-hostname; do
ln -f "${DESTDIR}${mandir}/man1/nmtui.1" "${DESTDIR}${mandir}/man1/${alias}.1" ln -f "${DESTDIR}${nm_mandir}/man1/nmtui.1" "${DESTDIR}${nm_mandir}/man1/${alias}.1"
done done
ln -f "${DESTDIR}${mandir}/man5/NetworkManager.conf.5" "${DESTDIR}${mandir}/man5/nm-system-settings.conf.5" ln -f "${DESTDIR}${nm_mandir}/man5/NetworkManager.conf.5" "${DESTDIR}${nm_mandir}/man5/nm-system-settings.conf.5"
fi fi
if [ "$8" = create_network_scripts ]; then if [ "$enable_ifcfg_rh" = 1 ]; then
sysconfdir=$9 mkdir -p "${DESTDIR}${nm_sysconfdir}/sysconfig/network-scripts"
mkdir -p "${DESTDIR}${sysconfdir}/sysconfig/network-scripts"
fi fi