Skip to content

Commit e03ff81

Browse files
committed
fix(fileglancer-app): don't assume cwd (again)
1 parent 245be11 commit e03ff81

2 files changed

Lines changed: 14 additions & 3 deletions

File tree

.fileglancer/runnables.yaml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ runnables:
1313
cpus: 1
1414
memory: "4 GB"
1515
walltime: "24:00"
16-
pre_run: umask 0002 && git submodule update --init --recursive
16+
pre_run: |
17+
umask 0002
18+
git submodule update --init --recursive
1719
command: >-
1820
"$(git rev-parse --show-toplevel)"/startup-scripts/fileglancer-paintera-convert.sh to-paintera
1921
parameters:
@@ -103,7 +105,9 @@ runnables:
103105
cpus: 1
104106
memory: "4 GB"
105107
walltime: "24:00"
106-
pre_run: umask 0002 && git submodule update --init --recursive
108+
pre_run: |
109+
umask 0002
110+
git submodule update --init --recursive
107111
command: >-
108112
"$(git rev-parse --show-toplevel)"/startup-scripts/fileglancer-paintera-convert.sh to-scalar
109113
parameters:
@@ -192,7 +196,9 @@ runnables:
192196
cpus: 1
193197
memory: "4 GB"
194198
walltime: "24:00"
195-
pre_run: umask 0002 && git submodule update --init --recursive
199+
pre_run: |
200+
umask 0002
201+
git submodule update --init --recursive
196202
command: >-
197203
"$(git rev-parse --show-toplevel)"/startup-scripts/fileglancer-paintera-convert.sh
198204
parameters:

startup-scripts/fileglancer-paintera-convert.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@
2222
set -uo pipefail
2323

2424
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
25+
PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
26+
27+
# run from the repo root so the jar build (mvnw) finds pom.xml and flintstone finds its scripts,
28+
# regardless of the directory Fileglancer launches us from (it uses the app's .fileglancer dir)
29+
cd "$PROJECT_ROOT"
2530

2631
# how often to poll, and how long to wait for the web UI URL before giving up on it (the
2732
# conversion keeps being waited on regardless)

0 commit comments

Comments
 (0)