1915a138c0
Same as #4584 but with an additional backport: https://github.com/msys2/msys2-pacman/pull/49 Old message: See msys2/msys2-pacman#45 makepkg.conf synced with the upstream version: https://gitlab.archlinux.org/pacman/pacman/-/blob/v6.1.0/etc/makepkg.conf.in Skip patches only changing CI configs
74 lines
2.1 KiB
Diff
74 lines
2.1 KiB
Diff
From 6fefe1f153145fa304b7f42917fa85d3eb1d3d73 Mon Sep 17 00:00:00 2001
|
|
From: Christoph Reiter <reiter.christoph@gmail.com>
|
|
Date: Tue, 28 Feb 2023 20:38:51 +0100
|
|
Subject: [PATCH 06/N] change shebang
|
|
|
|
(looks like this dropped a "set -e" which should be fixed)
|
|
---
|
|
scripts/makepkg.sh.in | 2 +-
|
|
scripts/pacman-db-upgrade.sh.in | 4 +++-
|
|
scripts/pacman-key.sh.in | 2 +-
|
|
scripts/repo-add.sh.in | 2 +-
|
|
scripts/wrapper.sh.in | 2 +-
|
|
5 files changed, 7 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
|
|
index f49e902..aa2d88d 100644
|
|
--- a/scripts/makepkg.sh.in
|
|
+++ b/scripts/makepkg.sh.in
|
|
@@ -1,4 +1,4 @@
|
|
-#!/bin/bash
|
|
+#!/usr/bin/env bash
|
|
#
|
|
# makepkg - make packages compatible for use with pacman
|
|
#
|
|
diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in
|
|
index 6942ced..166da96 100644
|
|
--- a/scripts/pacman-db-upgrade.sh.in
|
|
+++ b/scripts/pacman-db-upgrade.sh.in
|
|
@@ -1,4 +1,4 @@
|
|
-#!/bin/bash -e
|
|
+#!/usr/bin/env bash
|
|
#
|
|
# pacman-db-upgrade - upgrade the local pacman db to a newer format
|
|
#
|
|
@@ -18,6 +18,8 @@
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
#
|
|
|
|
+set -e
|
|
+
|
|
# Avoid creating world-unreadable files
|
|
umask 022
|
|
|
|
diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in
|
|
index 405c095..cbf3be3 100644
|
|
--- a/scripts/pacman-key.sh.in
|
|
+++ b/scripts/pacman-key.sh.in
|
|
@@ -1,4 +1,4 @@
|
|
-#!/bin/bash
|
|
+#!/usr/bin/env bash
|
|
#
|
|
# pacman-key - manages pacman's keyring
|
|
# Based on apt-key, from Debian
|
|
diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in
|
|
index bdd549d..9d60375 100644
|
|
--- a/scripts/repo-add.sh.in
|
|
+++ b/scripts/repo-add.sh.in
|
|
@@ -1,4 +1,4 @@
|
|
-#!/bin/bash
|
|
+#!/usr/bin/env bash
|
|
#
|
|
# repo-add - add a package to a given repo database file
|
|
# repo-remove - remove a package entry from a given repo database file
|
|
diff --git a/scripts/wrapper.sh.in b/scripts/wrapper.sh.in
|
|
index 31b18d1..6f6eaa7 100644
|
|
--- a/scripts/wrapper.sh.in
|
|
+++ b/scripts/wrapper.sh.in
|
|
@@ -1,4 +1,4 @@
|
|
-#!/bin/bash
|
|
+#!/usr/bin/env bash
|
|
#
|
|
# @PROGNAME@ - a wrapper for running the real @PROGNAME@ in the source tree
|
|
#
|