Skip to content

Commit a3c0187

Browse files
authored
Merge pull request pkgforge-dev#31 from psadi/feature/ghostty_resources
ci: flip env load order
2 parents da2df31 + 95ece6f commit a3c0187

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,9 @@ xvfb-run -a -- ./lib4bin -p -v -e -s -k ./usr/bin/ghostty /usr/lib/libEGL*
6666
rm -rf ./usr/bin
6767

6868
# Prepare AppImage -- Configure launcher script, metainfo and desktop file with icon.
69-
echo 'unset ARGV0' >./.env
7069
echo 'GHOSTTY_RESOURCES_DIR=${SHARUN_DIR}/usr/share/ghostty' >>./.env
70+
echo 'unset ARGV0' >>./.env
71+
7172
ln -s ./bin/ghostty ./AppRun
7273
./sharun -g
7374

setup.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ pacman -Syw --noconfirm ${buildPkgs} ${ghosttyPkgs}
3636
pacman -Syq --needed --noconfirm ${buildPkgs} ${ghosttyPkgs}
3737

3838
# Add debloated version of llvm-libs
39-
LLVM_URL="$(wget https://api.github.com/repos/pkgforge-dev/llvm-libs-debloated/releases -O - \
40-
| sed 's/[()",{} ]/\n/g' | grep -i "https.*llvm-libs-nano.*$ARCH.pkg.tar.*" | head -1)"
39+
LLVM_URL="$(wget https://api.github.com/repos/pkgforge-dev/llvm-libs-debloated/releases -O - |
40+
sed 's/[()",{} ]/\n/g' | grep -i "https.*llvm-libs-nano.*$ARCH.pkg.tar.*" | head -1)"
4141
wget "$LLVM_URL" -O ./llvm-libs.pkg.tar.zst
4242
pacman -U --noconfirm ./llvm-libs.pkg.tar.zst
4343
rm -f ./llvm-libs.pkg.tar.zst
4444

4545
# Add libxml2 version without libicudata dependency
46-
LIBXML_URL="$(wget https://api.github.com/repos/pkgforge-dev/llvm-libs-debloated/releases -O - \
47-
| sed 's/[()",{} ]/\n/g' | grep -i "https.*libxml2.*$ARCH.pkg.tar.*" | head -1)"
46+
LIBXML_URL="$(wget https://api.github.com/repos/pkgforge-dev/llvm-libs-debloated/releases -O - |
47+
sed 's/[()",{} ]/\n/g' | grep -i "https.*libxml2.*$ARCH.pkg.tar.*" | head -1)"
4848
wget "$LIBXML_URL" -O ./libxml2.pkg.tar.zst
4949
pacman -U --noconfirm ./libxml2.pkg.tar.zst
5050
rm -f ./libxml2.pkg.tar.zst

0 commit comments

Comments
 (0)