Merge pull request #2515 from cgwalters/cliwrap-lib

main: Also support CLI extensions in `/usr/libexec/libostree/ext`
This commit is contained in:
Joseph Marrero Corchado 2022-01-11 21:01:20 -05:00 committed by GitHub
commit 6567d82525
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 45 additions and 2 deletions

View File

@ -25,6 +25,10 @@ AC_SUBST([YEAR_VERSION], [year_version])
AC_SUBST([RELEASE_VERSION], [release_version])
AC_SUBST([PACKAGE_VERSION], [package_version])
dnl automake variables we want in pkg-config
pkglibexecdir=$libexecdir/$PACKAGE
AC_SUBST(pkglibexecdir)
AS_IF([echo "$CFLAGS" | grep -q -E -e '-Werror($| )'], [], [
CC_CHECK_FLAGS_APPEND([WARN_CFLAGS], [CFLAGS], [\
-pipe \

View File

@ -3,6 +3,7 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
features=@OSTREE_FEATURES@
cliextdir=@pkglibexecdir@/ext
Name: OSTree
Description: Git for operating system binaries

View File

@ -41,6 +41,10 @@ static gboolean opt_verbose;
static gboolean opt_version;
static gboolean opt_print_current_dir;
// TODO: make this public? But no one sane wants to use our C headers
// to find where to put files. Maybe we can make it printed by the CLI?
#define _OSTREE_EXT_DIR PKGLIBEXECDIR "/ext"
static GOptionEntry global_entries[] = {
{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &opt_verbose, "Print debug information during command processing", NULL },
{ "version", 0, 0, G_OPTION_ARG_NONE, &opt_version, "Print version information and exit", NULL },
@ -188,7 +192,7 @@ ostree_command_lookup_external (int argc,
// Find the first verb (ignoring all earlier flags), then
// check if it is a known native command. Otherwise, try to look it
// up in $PATH.
// up in /usr/lib/ostree/ostree-$cmd or $PATH.
// We ignore argv[0] here, the ostree binary itself is not multicall.
for (guint arg_index = 1; arg_index < argc; arg_index++)
{
@ -204,10 +208,18 @@ ostree_command_lookup_external (int argc,
return NULL;
}
g_autofree gchar *ext_command = g_strdup_printf ("ostree-%s", current_arg);
/* First, search in our libdir /usr/lib/ostree/ostree-$cmd */
g_autofree char *ext_lib = g_strconcat (_OSTREE_EXT_DIR, "/", ext_command, NULL);
struct stat stbuf;
if (stat (ext_lib, &stbuf) == 0)
return g_steal_pointer (&ext_lib);
/* Otherwise, look in $PATH */
if (g_find_program_in_path (ext_command) == NULL)
return NULL;
return g_steal_pointer (&ext_command);
}

View File

@ -0,0 +1,23 @@
#!/bin/bash
# Random misc tests
set -xeuo pipefail
. ${KOLA_EXT_DATA}/libinsttest.sh
echo "1..1"
date
# Test CLI extensions installed alongside the system
extdir=/usr/libexec/libostree/ext/
mkdir -p "${extdir}"
ln -sr /usr/bin/env ${extdir}/ostree-env
env TESTENV=foo ostree env > out.txt
assert_file_has_content out.text TESTENV=foo
rm -vf "${extdir}/ostree-env"
echo "ok env"
# End test
date

View File

@ -9,6 +9,9 @@ set -euo pipefail
echo '1..2'
# Test CLI extensions via $PATH. If you change this, you may
# also want to change the corresponding destructive version in
# tests/kolainst/destructive/basic-misc.sh
mkdir -p ./localbin
ORIG_PATH="${PATH}"
export PATH="./localbin/:${PATH}"