blob: 6825065cb9d6758cffcafa3ff1f048f0ba643f46 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
From 64a049a1f4245a88781c4cc4d89ab608443208f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
<848000+eclairevoyant@users.noreply.github.com>
Date: Tue, 16 May 2023 02:01:30 -0400
Subject: [PATCH] hardcode path to bashplus
---
lib/git-subrepo | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/lib/git-subrepo b/lib/git-subrepo
index a6d5d96..4006c19 100755
--- a/lib/git-subrepo
+++ b/lib/git-subrepo
@@ -12,21 +12,7 @@ set -e
export FILTER_BRANCH_SQUELCH_WARNING=1
# Import Bash+ helper functions:
-SOURCE=${BASH_SOURCE[0]}
-while [[ -h $SOURCE ]]; do
- DIR=$( cd -P "$( dirname "$SOURCE" )" && pwd )
- SOURCE=$(readlink "$SOURCE")
- [[ $SOURCE != /* ]] && SOURCE=$DIR/$SOURCE
-done
-SOURCE_DIR=$(dirname "$SOURCE")
-
-if [[ -z $GIT_SUBREPO_ROOT ]]; then
- # If `make install` installation used:
- source "${SOURCE_DIR}/git-subrepo.d/bash+.bash"
-else
- # If `source .rc` method used:
- source "${SOURCE_DIR}/../ext/bashplus/lib/bash+.bash"
-fi
+source /usr/lib/bash+.bash
bash+:import :std can version-check
--
2.40.1
|