Skip to content

Commit 64ecf29

Browse files
committed
Merge branch 'arch_linux_install' into dev
2 parents 7301f97 + 61c704d commit 64ecf29

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

scripts/install.sh

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -90,32 +90,32 @@ elif grep -q 'Arch Linux' /etc/*-release; then
9090
cd "$WORKDIR/build"
9191
mkdir -p libseccomp libnl openssl sqlite libbsd zstd
9292
cd libseccomp
93-
curl -O https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/libseccomp/trunk/PKGBUILD
94-
sed -i "s/^makedepends.*$/\0\noptions=('staticlibs')/" PKGBUILD
93+
curl -O https://gitlab.archlinux.org/archlinux/packaging/packages/libseccomp/-/raw/main/PKGBUILD
94+
sed -i "s/^makedepends.*$/\0\noptions=('staticlibs' !'lto')/" PKGBUILD
9595
makepkg -si --skippgpcheck --nocheck --noconfirm
9696
cd ../libnl
97-
curl -O https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/libnl/trunk/PKGBUILD
98-
sed -i "s/^depends.*$/\0\noptions=('staticlibs')/" PKGBUILD
97+
curl -O https://gitlab.archlinux.org/archlinux/packaging/packages/libnl/-/raw/main/PKGBUILD
98+
sed -i "s/^depends.*$/\0\noptions=('staticlibs' !'lto')/" PKGBUILD
9999
sed -Ei '/sbindir/, /disable-static/ s/(--d| \\).*//' PKGBUILD
100100
makepkg -si --skippgpcheck --nocheck --noconfirm
101101
cd ../openssl
102-
curl -O https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/openssl/trunk/PKGBUILD
103-
curl -O https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/openssl/trunk/ca-dir.patch
104-
sed -i "s/^makedepends.*$/\0\noptions=('staticlibs')/" PKGBUILD
102+
curl -O https://gitlab.archlinux.org/archlinux/packaging/packages/openssl/-/raw/main/PKGBUILD
103+
curl -O https://gitlab.archlinux.org/archlinux/packaging/packages/openssl/-/raw/main/ca-dir.patch
104+
sed -i "s/^makedepends.*$/\0\noptions=('staticlibs' !'lto')/" PKGBUILD
105105
makepkg -si --skippgpcheck --nocheck --noconfirm
106106
cd ../sqlite
107107
for i in PKGBUILD license.txt sqlite-lemon-system-template.patch; do
108-
curl -O https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/sqlite/trunk/$i
108+
curl -O https://gitlab.archlinux.org/archlinux/packaging/packages/sqlite/-/raw/main/$i
109109
done
110-
sed -i "s/^options=./\0'staticlibs' /; /disable-static/ d" PKGBUILD
110+
sed -i "s/^options=./\0'staticlibs' !'lto' /; /disable-static/ d" PKGBUILD
111111
makepkg -si --noconfirm
112112
cd ../libbsd
113-
curl -O https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/libbsd/trunk/PKGBUILD
113+
curl -O https://gitlab.archlinux.org/archlinux/packaging/packages/libbsd/-/raw/main/PKGBUILD
114114
sed -i "/rm.*libbsd\.a/ d" PKGBUILD
115115
makepkg -si --skippgpcheck --nocheck --noconfirm
116116
cd ../zstd
117-
curl -O https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/zstd/trunk/PKGBUILD
118-
sed -i "s/makedepends.*$/\0\noptions=('staticlibs')/; /-DZSTD_BUILD_STATIC=OFF/ d" PKGBUILD
117+
curl -O https://gitlab.archlinux.org/archlinux/packaging/packages/zstd/-/raw/main/PKGBUILD
118+
sed -i "s/makedepends.*$/\0\noptions=('staticlibs' !'lto')/; /-DZSTD_BUILD_STATIC=OFF/ d" PKGBUILD
119119
makepkg -si --skippgpcheck --nocheck --noconfirm
120120

121121
# Setup mysql
@@ -145,7 +145,8 @@ fi
145145

146146
# Install gems
147147
cd "$WORKDIR/tioj"
148-
gem install passenger:'~> 6' -N
148+
passenger_version="$(grep -Po ' passenger \(\K\d.*(?=\))' Gemfile.lock | head -1)"
149+
gem install passenger:"$passenger_version" -N
149150
PASSENGER_LOG=$(sudo mktemp -d)
150151
sudo chmod 755 $PASSENGER_LOG
151152
export rvmsudo_secure_path=1

0 commit comments

Comments
 (0)