From nobody Mon Feb 9 11:02:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594894761; cv=none; d=zohomail.com; s=zohoarc; b=QCHBe+EefWcw7fLnHEDbxhoVj6ZLs7nTu2RrIRPRbG5l7l+rPF9/1EigsdRGxgQap/wZ7I3feVadPJvD6kMPs/nGfS68Wv26EOVrqv7xOyztxqNs1mcb/pMOUZStVqtqeN3aUVLBmEmUCdmUKO5ToTlbHNluGn38TMYg1QEoeSM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894761; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EhJ+EtBXcVzcX7tybTwnDgJrOimNkVPz+TEBMAC349I=; b=Yj6zU9alRMeszk3dX5UsUX7JeSjd3tiy7qBArvPD0ye764GYEa6DqhWzBujFdU8p6WqXuF/+MVFWniYuR4UNl5/fpxFkADISepiHLOfSa1xcG85tidJfE/HfUmliIQWFWV+1BNDacAmQEoW8Gv5iUNOAGXer/80BnHSEohjIMAw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894761401994.5245445667655; Thu, 16 Jul 2020 03:19:21 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-189-KoGBAhzwOJ22v0z2TP___w-1; Thu, 16 Jul 2020 06:10:27 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BCA2D100AA2B; Thu, 16 Jul 2020 10:10:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 96BDD1053B03; Thu, 16 Jul 2020 10:10:21 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5ADA6A36FD; Thu, 16 Jul 2020 10:10:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06GA6RIQ019610 for ; Thu, 16 Jul 2020 06:06:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id CA9EE2B6DC; Thu, 16 Jul 2020 10:06:27 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 453E52B6DB for ; Thu, 16 Jul 2020 10:06:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894760; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=EhJ+EtBXcVzcX7tybTwnDgJrOimNkVPz+TEBMAC349I=; b=Kiw5WnLCC1zZn75d+nc54/vWzzPmGD893GZXp8HLw74BkVSx9qcjM7/QHuuP7HnHBuQ+Si i7jPAaWlmAq4GFIvDRArtV3BO9HkuR/cCut6qv1dkUN7S1D8S0lDJYWLvnnhiopLJPnnt3 cS8np6d/ajC8jvqm9f1YGRHGKWUicPE= X-MC-Unique: KoGBAhzwOJ22v0z2TP___w-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 268/351] meson: tools: install bash-completion files Date: Thu, 16 Jul 2020 11:58:24 +0200 Message-Id: <499347c9d205623dcff6c62cc4bd90897c05915c.1594891445.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- tools/Makefile.am | 27 ++------------------------- tools/bash-completion/meson.build | 13 +++++++++++++ tools/meson.build | 4 ++++ 3 files changed, 19 insertions(+), 25 deletions(-) create mode 100644 tools/bash-completion/meson.build diff --git a/tools/Makefile.am b/tools/Makefile.am index ba3b0bbc120..9c91cac9ccf 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -23,32 +23,9 @@ STANDALONE_CPPFLAGS =3D -I$(top_srcdir) =20 noinst_LTLIBRARIES =3D =20 -install-data-local: install-nss \ - install-bash-completion - -uninstall-local: uninstall-nss \ - uninstall-bash-completion - -if WITH_BASH_COMPLETION -install-bash-completion: - $(MKDIR_P) "$(DESTDIR)$(BASH_COMPLETIONS_DIR)" - $(INSTALL_DATA) $(srcdir)/bash-completion/vsh \ - "$(DESTDIR)$(BASH_COMPLETIONS_DIR)/vsh" - ( cd $(DESTDIR)$(BASH_COMPLETIONS_DIR) && \ - rm -f virsh virt-admin && \ - $(LN_S) vsh virsh && \ - $(LN_S) vsh virt-admin ) - -uninstall-bash-completion: - rm -f $(DESTDIR)$(BASH_COMPLETIONS_DIR)/vsh \ - $(DESTDIR)$(BASH_COMPLETIONS_DIR)/virsh \ - $(DESTDIR)$(BASH_COMPLETIONS_DIR)/virt-admin - rmdir $(DESTDIR)$(BASH_COMPLETIONS_DIR) ||: -else ! WITH_BASH_COMPLETION -install-bash-completion: -uninstall-bash-completion: -endif ! WITH_BASH_COMPLETION +install-data-local: install-nss =20 +uninstall-local: uninstall-nss =20 if WITH_WIRESHARK_DISSECTOR =20 diff --git a/tools/bash-completion/meson.build b/tools/bash-completion/meso= n.build new file mode 100644 index 00000000000..4cc0892accf --- /dev/null +++ b/tools/bash-completion/meson.build @@ -0,0 +1,13 @@ +install_data('vsh', install_dir: bash_completion_dir) + +meson.add_install_script( + install_symlink_prog.path(), + bash_completion_dir, + 'vsh', 'virsh', +) + +meson.add_install_script( + install_symlink_prog.path(), + bash_completion_dir, + 'vsh', 'virt-admin', +) diff --git a/tools/meson.build b/tools/meson.build index ce8f2bdd1e3..36c05d43d9c 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -278,3 +278,7 @@ if init_script =3D=3D 'systemd' install_dir: prefix / 'lib' / 'systemd' / 'system', ) endif + +if bash_completion_dep.found() + subdir('bash-completion') +endif --=20 2.26.2