diff options
author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2019-08-14 13:41:01 +0000 |
---|---|---|
committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2019-08-14 13:41:01 +0000 |
commit | bca3cb716cc92ad79e58d3f54e188f84920d789a (patch) | |
tree | dfcb7982d4d8a8c5c1f57c2117f7cea5edac9763 | |
parent | c0fdf41e20d6e306e03f2a82c5b5134fa7f316f6 (diff) | |
parent | 31579cb708e51d4c922069d6a74bdd93914a5533 (diff) | |
download | mm-common-bca3cb716cc92ad79e58d3f54e188f84920d789a.tar.gz |
Merge branch 'wip/lantw/dont-hard-code-the-path-of-bash-use-short-options-to-run-tar-commands' into 'master'
Don't hard-code the path of bash and use short options to run tar commands
See merge request GNOME/mm-common!1
-rwxr-xr-x | skeletonmm/codegen/generate_defs_and_docs.sh | 2 | ||||
-rwxr-xr-x | util/meson_aux/extra-dist-cmd.sh | 2 | ||||
-rwxr-xr-x | util/meson_aux/extra-install-cmd.sh | 2 | ||||
-rwxr-xr-x | util/meson_aux/libstdcxx-tag.sh | 2 | ||||
-rwxr-xr-x | util/meson_aux/skeletonmm-tarball.sh | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/skeletonmm/codegen/generate_defs_and_docs.sh b/skeletonmm/codegen/generate_defs_and_docs.sh index 7deb248..04d9773 100755 --- a/skeletonmm/codegen/generate_defs_and_docs.sh +++ b/skeletonmm/codegen/generate_defs_and_docs.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # skeletonmm/codegen/generate_defs_and_docs.sh diff --git a/util/meson_aux/extra-dist-cmd.sh b/util/meson_aux/extra-dist-cmd.sh index b73c1f4..df65e2f 100755 --- a/util/meson_aux/extra-dist-cmd.sh +++ b/util/meson_aux/extra-dist-cmd.sh @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/sh -e # External command, intended to be called with meson.add_dist_script() in meson.build diff --git a/util/meson_aux/extra-install-cmd.sh b/util/meson_aux/extra-install-cmd.sh index 79f44b0..e07a692 100755 --- a/util/meson_aux/extra-install-cmd.sh +++ b/util/meson_aux/extra-install-cmd.sh @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/sh -e # External command, intended to be called with meson.add_install_script() in meson.build diff --git a/util/meson_aux/libstdcxx-tag.sh b/util/meson_aux/libstdcxx-tag.sh index 9ac83f2..300ea09 100755 --- a/util/meson_aux/libstdcxx-tag.sh +++ b/util/meson_aux/libstdcxx-tag.sh @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/sh -e # External command, intended to be called with custom_target() in meson.build diff --git a/util/meson_aux/skeletonmm-tarball.sh b/util/meson_aux/skeletonmm-tarball.sh index c36f126..ff50bc5 100755 --- a/util/meson_aux/skeletonmm-tarball.sh +++ b/util/meson_aux/skeletonmm-tarball.sh @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/sh -e # External command, intended to be called with custom_target() in meson.build @@ -10,7 +10,7 @@ shift; shift # These options don't contain filenames, and thus no spaces that # must be preserved in the call to tar. -tar_options="--create --dereference --old-archive --file=-" +tar_options="-chof -" case "$output_file" in *.xz) |