Skip to content

Commit 8a2e72e

Browse files
committed
set PYTHONPATH more safely
Signed-off-by: Konstantin Gizdov <kgizdov@gmail.com>
1 parent 67a4cae commit 8a2e72e

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

.SRCINFO

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pkgbase = root
22
pkgdesc = C++ data analysis framework and interpreter from CERN.
33
pkgver = 6.06.08
4-
pkgrel = 1
4+
pkgrel = 2
55
url = http://root.cern.ch
66
arch = i686
77
arch = x86_64
@@ -40,7 +40,7 @@ pkgbase = root
4040
sha256sums = 437ed0fb2c46d5ca8e37cc689f87dfe12429f6a243d4e5cf2d395a177de7e90f
4141
sha256sums = e03fff4accf7cee4e7329b305f1e0df7bf804dbced08d52566af789bc77ea0b0
4242
sha256sums = d566bc44f0df1915ac81c41b8ef7eff0d9fec8728533b00b9e654a2a4eff9af1
43-
sha256sums = 71ed39f7e5a605a6a02e3d0ba79c997b8e7f02551898c27112eb78f07d9d8244
43+
sha256sums = 9d1f8e7ad923cb5450386edbbce085d258653c0160419cdd6ff154542cc32bd7
4444
sha256sums = b103d46705883590d9e07aafb890ec1150f63dc2ca5f40d67e6ebef49a6d0a32
4545
sha256sums = 3c45b03761d5254142710b7004af0077f18efece7c95511910140d0542c8de8a
4646
sha256sums = 55be51afce766acca6ddd8123518af47a5d43c826233a2267c2404b68b662aee

PKGBUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
pkgname=root
88
pkgver=6.06.08
9-
pkgrel=1
9+
pkgrel=2
1010
pkgdesc='C++ data analysis framework and interpreter from CERN.'
1111
arch=('i686' 'x86_64')
1212
url='http://root.cern.ch'
@@ -52,7 +52,7 @@ sha256sums=('7cb836282014cce822ef589cad27811eb7a86d7fad45a871fa6b0e6319ec201a'
5252
'437ed0fb2c46d5ca8e37cc689f87dfe12429f6a243d4e5cf2d395a177de7e90f'
5353
'e03fff4accf7cee4e7329b305f1e0df7bf804dbced08d52566af789bc77ea0b0'
5454
'd566bc44f0df1915ac81c41b8ef7eff0d9fec8728533b00b9e654a2a4eff9af1'
55-
'71ed39f7e5a605a6a02e3d0ba79c997b8e7f02551898c27112eb78f07d9d8244'
55+
'9d1f8e7ad923cb5450386edbbce085d258653c0160419cdd6ff154542cc32bd7'
5656
'b103d46705883590d9e07aafb890ec1150f63dc2ca5f40d67e6ebef49a6d0a32'
5757
'3c45b03761d5254142710b7004af0077f18efece7c95511910140d0542c8de8a'
5858
'55be51afce766acca6ddd8123518af47a5d43c826233a2267c2404b68b662aee')

root.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
if [ $PYTHONPATH ]; then
2-
export PYTHONPATH=$PYTHONPATH:/usr/lib/root;
2+
if [[ ":$PYTHONPATH:" == *":/usr/lib/root:"* ]]; then
3+
return 0;
4+
else
5+
export PYTHONPATH=$PYTHONPATH:/usr/lib/root;
6+
fi
37
else
48
export PYTHONPATH=/usr/lib/root;
59
fi

0 commit comments

Comments
 (0)