summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Careil2022-11-21 14:01:56 +0100
committerBaptiste Careil2022-11-21 14:01:56 +0100
commit097375b50db4533d0da845a52f2098800e7da0b4 (patch)
treed4724f06be2f176463524047588c84932b6d60bc
parent993c4a9d5acc765f52d5c615a9d8125d5de93ba6 (diff)
downloadaur-097375b50db4533d0da845a52f2098800e7da0b4.tar.gz
Fixed LUA_PATH to pick up upstream dependencies
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD8
-rw-r--r--PathOfBuilding.sh5
3 files changed, 7 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b52b232a864f..37355afca832 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -32,7 +32,7 @@ pkgbase = path-of-building-community-git
sha256sums = SKIP
sha256sums = SKIP
sha256sums = 6d21872a2b2bdbfaebb20de5cac28ac402316e5314c97a89049320ff13c2f622
- sha256sums = db9eec714bf9d1c52b1ccd7adc9e720519585becf7f9a1f18cca1888d3e1cc11
+ sha256sums = 30118e22623b645a5e2cc81240fcf36d5189613383a09d1225aa3a76f7eba245
sha256sums = 9dbc8802b74ceed78f1a6ba1d5b90251f5ae7f9a8cf5497426e4a35001112fcd
sha256sums = cd46475a1bc62240e03abb6b385b0c9b0b911ad828219fd31f98f7742807f935
sha256sums = 2467d10c7b5e201e337ba334a829e293a07027251bcda2b1f39774a62e8ff194
diff --git a/PKGBUILD b/PKGBUILD
index 0abfa14db01a..68cd003996cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -28,7 +28,7 @@ sha256sums=(
'SKIP'
'SKIP'
'6d21872a2b2bdbfaebb20de5cac28ac402316e5314c97a89049320ff13c2f622'
- 'db9eec714bf9d1c52b1ccd7adc9e720519585becf7f9a1f18cca1888d3e1cc11'
+ '30118e22623b645a5e2cc81240fcf36d5189613383a09d1225aa3a76f7eba245'
'9dbc8802b74ceed78f1a6ba1d5b90251f5ae7f9a8cf5497426e4a35001112fcd'
'cd46475a1bc62240e03abb6b385b0c9b0b911ad828219fd31f98f7742807f935'
'2467d10c7b5e201e337ba334a829e293a07027251bcda2b1f39774a62e8ff194'
@@ -94,11 +94,7 @@ package() {
#done
# copy changelog where it will be found by the application
mv changelog.txt src/
- # extract lua libs
- unzip runtime-win32.zip lua/xml.lua lua/base64.lua lua/sha1.lua
- mv lua/*.lua .
- rmdir lua
- rm runtime-win32.zip
+ # copy lua libs
# tidy-up permissions
chmod og-w -R "${dst_dir}"
# install binaries
diff --git a/PathOfBuilding.sh b/PathOfBuilding.sh
index d7b640095bce..1bc4def86652 100644
--- a/PathOfBuilding.sh
+++ b/PathOfBuilding.sh
@@ -1,2 +1,5 @@
#!/bin/bash
-cd /opt/PathOfBuildingCommunity/ && LC_ALL=C ./pobfrontend "$@"
+dir=/opt/PathOfBuildingCommunity
+export LUA_PATH="$dir/runtime/lua/?.lua;$dir/runtime/lua/?/init.lua${LUA_PATH:+;$LUA_PATH}${LUA_PATH:-;;}"
+echo $LUA_PATH
+cd $dir && LC_ALL=C ./pobfrontend "$@"