From 5fdcb1968516691f4e77f1537ea51f66dd025310 Mon Sep 17 00:00:00 2001 From: Olivier MEDOC Date: Mon, 23 Oct 2017 20:16:27 +0200 Subject: [PATCH] archlinux: enforce usage of python2 in all scripts --- archlinux/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD index 1f9f44b..8494064 100644 --- a/archlinux/PKGBUILD +++ b/archlinux/PKGBUILD @@ -45,10 +45,10 @@ build() { sed 's:/bin/grep:grep:g' -i network/* # Force running all scripts with python2 - sed 's:#!/usr/bin/python:#!/usr/bin/python2:' -i misc/* - sed 's:#!/usr/bin/env python:#!/usr/bin/env python2:' -i misc/* - sed 's:#!/usr/bin/python:#!/usr/bin/python2:' -i qubes-rpc/* - sed 's:#!/usr/bin/env python:#!/usr/bin/env python2:' -i qubes-rpc/* + sed 's:^#!/usr/bin/python.*:#!/usr/bin/python2:' -i misc/* + sed 's:^#!/usr/bin/env python.*:#!/usr/bin/env python2:' -i misc/* + sed 's:^#!/usr/bin/python.*:#!/usr/bin/python2:' -i qubes-rpc/* + sed 's:^#!/usr/bin/env python.*:#!/usr/bin/env python2:' -i qubes-rpc/* # Fix for archlinux sbindir sed 's:/usr/sbin/ntpdate:/usr/bin/ntpdate:g' -i qubes-rpc/sync-ntp-clock @@ -64,7 +64,7 @@ package() { # shellcheck disable=SC2154 make -C qrexec install DESTDIR="$pkgdir" SBINDIR=/usr/bin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib - make install-vm DESTDIR="$pkgdir" SBINDIR=/usr/bin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib SYSTEM_DROPIN_DIR=/usr/lib/systemd/system USER_DROPIN_DIR=/usr/lib/systemd/user DIST=archlinux + PYTHON=python2 make install-vm DESTDIR="$pkgdir" SBINDIR=/usr/bin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib SYSTEM_DROPIN_DIR=/usr/lib/systemd/system USER_DROPIN_DIR=/usr/lib/systemd/user DIST=archlinux # Remove things non wanted in archlinux rm -r "$pkgdir/etc/yum"*