meson: revert the change to unquote commands in add_install_script

Old meson fails with:
Element not a string: [<Holder: <ExternalProgram 'sh' -> ['/bin/sh']>>, '-c', 'test -n "$DESTDIR" || /bin/journalctl --update-catalog']

I'm doing it as a revert so that it's easy to undo the revert when we require
newer meson. The effect is not so bad, maybe a dozen or so lines about finding
'sh'.

diff --git a/catalog/meson.build b/catalog/meson.build
index d34e413d4f14e6d2ad6ff4dd8413892104415f71..7139c2e0531397711f4bfcfda7501d247be109e7 100644 (file)
--- a/catalog/meson.build
+++ b/catalog/meson.build
@@ -29,5 +29,5 @@ foreach file : in_files
                 install_dir : catalogdir)
 endforeach
 
-meson.add_install_script(sh, '-c',
+meson.add_install_script('sh', '-c',
                          'test -n "$DESTDIR" || @0@/journalctl --update-catalog'.format(rootbindir))

diff --git a/hwdb.d/meson.build b/hwdb.d/meson.build
index f43bcbbea700c7b497c1c790a48ca0777497a8c3..fd8c15a521da012a081b0e11edcd646c4faf9651 100644 (file)
--- a/hwdb.d/meson.build
+++ b/hwdb.d/meson.build
@@ -47,9 +47,10 @@ if conf.get('ENABLE_HWDB') == 1
                      install_dir : udevhwdbdir)
 
         if install_sysconfdir
-                meson.add_install_script(sh, '-c', mkdir_p.format(join_paths(sysconfdir, 'udev/hwdb.d')))
+                meson.add_install_script('sh', '-c',
+                                         mkdir_p.format(join_paths(sysconfdir, 'udev/hwdb.d')))
 
-                meson.add_install_script(sh, '-c',
+                meson.add_install_script('sh', '-c',
                                          'test -n "$DESTDIR" || @0@/systemd-hwdb update'.format(rootbindir))
         endif
 

diff --git a/meson.build b/meson.build
index 5c7f3648f50ac7f3bf6b6fc65bed3afd7ffb6d3f..a8bbeacd859faba4e49f7c342415027b685685bc 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -612,7 +612,7 @@ git = find_program('git', required : false)
 env = find_program('env')
 perl = find_program('perl', required : false)
 rsync = find_program('rsync', required : false)
-meson_make_symlink = find_program('tools/meson-make-symlink.sh')
+meson_make_symlink = project_source_root + '/tools/meson-make-symlink.sh'
 test_efi_create_disk_sh = find_program('test/test-efi-create-disk.sh')
 
 mkdir_p = 'mkdir -p $DESTDIR/@0@'
@@ -1870,7 +1870,7 @@ foreach tuple : [['myhostname', 'ENABLE_NSS_MYHOSTNAME'],
 
                 # We cannot use shared_module because it does not support version suffix.
                 # Unfortunately shared_library insists on creating the symlink…
-                meson.add_install_script(sh, '-c',
+                meson.add_install_script('sh', '-c',
                                          'rm $DESTDIR@0@/libnss_@1@.so'
                                          .format(rootlibdir, module))
 
@@ -2806,9 +2806,11 @@ if conf.get('ENABLE_BINFMT') == 1
                 install : true,
                 install_dir : rootlibexecdir)
 
-        meson.add_install_script(sh, '-c', mkdir_p.format(binfmtdir))
+        meson.add_install_script('sh', '-c',
+                                 mkdir_p.format(binfmtdir))
         if install_sysconfdir
-                meson.add_install_script(sh, '-c', mkdir_p.format(join_paths(sysconfdir, 'binfmt.d')))
+                meson.add_install_script('sh', '-c',
+                                         mkdir_p.format(join_paths(sysconfdir, 'binfmt.d')))
         endif
 endif
 
@@ -3272,9 +3274,11 @@ if conf.get('HAVE_KMOD') == 1
                 install : true,
                 install_dir : rootlibexecdir)
 
-        meson.add_install_script(sh, '-c', mkdir_p.format(modulesloaddir))
+        meson.add_install_script('sh', '-c',
+                                 mkdir_p.format(modulesloaddir))
         if install_sysconfdir
-                meson.add_install_script(sh, '-c', mkdir_p.format(join_paths(sysconfdir, 'modules-load.d')))
+                meson.add_install_script('sh', '-c',
+                                         mkdir_p.format(join_paths(sysconfdir, 'modules-load.d')))
         endif
 endif
 
@@ -3547,8 +3551,8 @@ install_data('LICENSE.GPL2',
              'docs/GVARIANT-SERIALIZATION.md',
              install_dir : docdir)
 
-meson.add_install_script(sh, '-c', mkdir_p.format(systemdstatedir))
-meson.add_install_script(sh, '-c', 'touch $DESTDIR@0@'.format(prefixdir))
+meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir))
+meson.add_install_script('sh', '-c', 'touch $DESTDIR@0@'.format(prefixdir))
 
 ############################################################
 

diff --git a/network/meson.build b/network/meson.build
index 7287dcf07733886849bb69922ef34c0734883ad6..b0e60f72176b38716565ae5e784a4da0517aba2c 100644 (file)
--- a/network/meson.build
+++ b/network/meson.build
@@ -11,7 +11,7 @@ if conf.get('ENABLE_NETWORKD') == 1
                      install_dir : networkdir)
 
         if install_sysconfdir
-                meson.add_install_script(sh, '-c',
+                meson.add_install_script('sh', '-c',
                                          mkdir_p.format(join_paths(sysconfdir, 'systemd/network')))
         endif
 endif

diff --git a/src/core/meson.build b/src/core/meson.build
index 3720c083aaf1dd55453ad9a2e57ad6a07ec2fdde..c5c9e8cbe81ac9b661d82c4255fb222426a74701 100644 (file)
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -203,15 +203,15 @@ policy = configure_file(
 install_data(policy,
              install_dir : polkitpolicydir)
 
-meson.add_install_script(sh, '-c', mkdir_p.format(systemshutdowndir))
-meson.add_install_script(sh, '-c', mkdir_p.format(systemsleepdir))
-meson.add_install_script(sh, '-c', mkdir_p.format(systemgeneratordir))
-meson.add_install_script(sh, '-c', mkdir_p.format(usergeneratordir))
+meson.add_install_script('sh', '-c', mkdir_p.format(systemshutdowndir))
+meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir))
+meson.add_install_script('sh', '-c', mkdir_p.format(systemgeneratordir))
+meson.add_install_script('sh', '-c', mkdir_p.format(usergeneratordir))
 
 if install_sysconfdir
-        meson.add_install_script(sh, '-c', mkdir_p.format(join_paths(pkgsysconfdir, 'system')))
-        meson.add_install_script(sh, '-c', mkdir_p.format(join_paths(pkgsysconfdir, 'user')))
-        meson.add_install_script(sh, '-c', mkdir_p.format(join_paths(sysconfdir, 'xdg/systemd')))
+        meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(pkgsysconfdir, 'system')))
+        meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(pkgsysconfdir, 'user')))
+        meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(sysconfdir, 'xdg/systemd')))
 endif
 
 ############################################################

diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build
index eea4174dd8b2f96d9e04eb87d46b923f363dc710..c42d85bc4b23ceedb286b123ae3e1b4c5615b268 100644 (file)
--- a/src/journal-remote/meson.build
+++ b/src/journal-remote/meson.build
@@ -67,9 +67,9 @@ if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1
                      install_dir : join_paths(pkgdatadir, 'gatewayd'))
 
         if get_option('create-log-dirs')
-                meson.add_install_script(sh, '-c',
+                meson.add_install_script('sh', '-c',
                                          mkdir_p.format('/var/log/journal/remote'))
-                meson.add_install_script(sh, '-c',
+                meson.add_install_script('sh', '-c',
                                          '''chown 0:0 $DESTDIR/var/log/journal/remote &&
                                             chmod 755 $DESTDIR/var/log/journal/remote || :''')
         endif

diff --git a/src/journal/meson.build b/src/journal/meson.build
index 474bdff727e8dc54871f51d1c8fdc19ea5ccecac..171e2767368375a29199c98686ec1b634ee9671a 100644 (file)
--- a/src/journal/meson.build
+++ b/src/journal/meson.build
@@ -56,17 +56,22 @@ if install_sysconfdir_samples
 endif
 
 if get_option('create-log-dirs')
-        meson.add_install_script(sh, '-c', mkdir_p.format('/var/log/journal'))
-        meson.add_install_script(sh, '-c',
-                                 '''chown 0:0 $DESTDIR/var/log/journal &&
-                                    chmod 755 $DESTDIR/var/log/journal || :''')
+        meson.add_install_script(
+                'sh', '-c',
+                mkdir_p.format('/var/log/journal'))
+        meson.add_install_script(
+                'sh', '-c',
+                '''chown 0:0 $DESTDIR/var/log/journal &&
+                   chmod 755 $DESTDIR/var/log/journal || :''')
         if get_option('adm-group')
-                meson.add_install_script(sh, '-c',
-                                         'setfacl -nm g:adm:rx,d:g:adm:rx $DESTDIR/var/log/journal || :')
+                meson.add_install_script(
+                        'sh', '-c',
+                        'setfacl -nm g:adm:rx,d:g:adm:rx $DESTDIR/var/log/journal || :')
         endif
         if get_option('wheel-group')
-                meson.add_install_script(sh, '-c',
-                                         'setfacl -nm g:wheel:rx,d:g:wheel:rx $DESTDIR/var/log/journal || :')
+                meson.add_install_script(
+                        'sh', '-c',
+                        'setfacl -nm g:wheel:rx,d:g:wheel:rx $DESTDIR/var/log/journal || :')
         endif
 endif
 

diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build
index 36b289df55c4897fe959bf71eaf93981eebc509f..4117188f147463913050a1a465e815b9316d076a 100644 (file)
--- a/src/kernel-install/meson.build
+++ b/src/kernel-install/meson.build
@@ -14,7 +14,7 @@ if want_kernel_install
                      install_dir : kernelinstalldir)
 
         if install_sysconfdir
-                meson.add_install_script(sh, '-c',
+                meson.add_install_script('sh', '-c',
                                          mkdir_p.format(join_paths(sysconfdir, 'kernel/install.d')))
         endif
 

diff --git a/src/udev/meson.build b/src/udev/meson.build
index 16774ef6ca677398ea214b9cc66754f9b72931a5..fd74e28682ffa5f63cfa623d0e985b88e5f9a505 100644 (file)
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -165,7 +165,8 @@ configure_file(
         install_dir : pkgconfigdatadir == 'no' ? '' : pkgconfigdatadir)
 
 if install_sysconfdir
-        meson.add_install_script(sh, '-c', mkdir_p.format(join_paths(sysconfdir, 'udev/rules.d')))
+        meson.add_install_script('sh', '-c',
+                                 mkdir_p.format(join_paths(sysconfdir, 'udev/rules.d')))
 endif
 
 fuzzers += [

diff --git a/sysctl.d/meson.build b/sysctl.d/meson.build
index ec0eecf65c48317898b60439135e0f0a8d50f7f6..7e3482af62a99589b21f8b2060e1d8980a01a1f4 100644 (file)
--- a/sysctl.d/meson.build
+++ b/sysctl.d/meson.build
@@ -28,5 +28,6 @@ foreach file : in_files
 endforeach
 
 if install_sysconfdir
-        meson.add_install_script(sh, '-c', mkdir_p.format(join_paths(sysconfdir, 'sysctl.d')))
+        meson.add_install_script('sh', '-c',
+                                 mkdir_p.format(join_paths(sysconfdir, 'sysctl.d')))
 endif

diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build
index 3b2c5ab376a3ebe7cff84bcab752c5944658e2b5..d5d4bbc9ea4e59471c58861a2f397603d7e3f44e 100644 (file)
--- a/tmpfiles.d/meson.build
+++ b/tmpfiles.d/meson.build
@@ -57,5 +57,7 @@ foreach file : m4_files
 endforeach
 
 if enable_tmpfiles and install_sysconfdir
-        meson.add_install_script(sh, '-c', mkdir_p.format(join_paths(sysconfdir, 'tmpfiles.d')))
+        meson.add_install_script(
+                'sh', '-c',
+                mkdir_p.format(join_paths(sysconfdir, 'tmpfiles.d')))
 endif

diff --git a/units/meson.build b/units/meson.build
index a0fbe3e15a7bd2d18f9aab2412fdf4ffc2e055c7..01850a82472a2c95425f7451f211659a1489cbb3 100644 (file)
--- a/units/meson.build
+++ b/units/meson.build
@@ -348,7 +348,7 @@ meson.add_install_script(meson_make_symlink,
 if conf.get('HAVE_SYSV_COMPAT') == 1
         foreach i : [1, 2, 3, 4, 5]
                 meson.add_install_script(
-                        sh, '-c',
+                        'sh', '-c',
                         mkdir_p.format(join_paths(systemunitdir, 'runlevel@0@.target.wants'.format(i))))
         endforeach
 endif