Skip to content

Commit 071cefc

Browse files
authored
Revert "Fix Package AppImage script (#6681)" (#6714)
This reverts commit 41cc260.
1 parent 32a5cc8 commit 071cefc

File tree

1 file changed

+1
-42
lines changed

1 file changed

+1
-42
lines changed

package-appimage.sh

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@ echo "When this file exists, app will not store configs under this folder" >"${P
1717
if [ $Arch = "linux-64" ]; then
1818
Arch2="x86_64"
1919
Arch3="amd64"
20-
Interpreter="ld-linux-x86-64.so.2"
2120
else
2221
Arch2="aarch64"
2322
Arch3="arm64"
24-
Interpreter="ld-linux-aarch64.so.1"
2523
fi
2624
echo $Arch2
2725

@@ -31,7 +29,6 @@ cat >"${PackagePath}/AppDir/AppRun" <<-EOF
3129
HERE="\$(dirname "\$(readlink -f "\${0}")")"
3230
export PATH="\${HERE}"/opt/v2rayN/:"\${PATH}"
3331
export LD_LIBRARY_PATH="\${HERE}"/opt/v2rayN/:"\${LD_LIBRARY_PATH}"
34-
cd "\${HERE}/opt/v2rayN"
3532
exec "\${HERE}/opt/v2rayN/v2rayN" \$@
3633
EOF
3734

@@ -48,41 +45,9 @@ EOF
4845

4946
sudo cp "${PackagePath}/AppDir/opt/v2rayN/v2rayN.png" "${PackagePath}/AppDir/v2rayN.png"
5047
sudo dpkg --add-architecture ${Arch3}
51-
sudo apt update
5248
mkdir deb_folder
5349
cd deb_folder
54-
apt download libstdc++6:${Arch3}
55-
apt download libc6:${Arch3}
56-
apt download libcrypt1:${Arch3}
57-
apt download libgcc-s1:${Arch3}
58-
apt download libidn2-0:${Arch3}
59-
apt download gcc-12-base:${Arch3}
60-
apt download zlib1g:${Arch3}
61-
apt download libfreetype6:${Arch3}
62-
apt download libexpat1:${Arch3}
63-
apt download libbrotli1:${Arch3}
64-
apt download libx11-6:${Arch3}
65-
apt download libx11-xcb1:${Arch3}
66-
apt download libxcb1:${Arch3}
67-
apt download libxau6:${Arch3}
68-
apt download libxdmcp6:${Arch3}
69-
apt download libbsd0:${Arch3}
70-
apt download libmd0:${Arch3}
71-
apt download libice6:${Arch3}
72-
apt download libsm6:${Arch3}
73-
apt download libuuid1:${Arch3}
74-
apt download libxrandr2:${Arch3}
75-
apt download libxext6:${Arch3}
76-
apt download libxrender1:${Arch3}
77-
apt download libxi6:${Arch3}
78-
apt download libsm6:${Arch3}
79-
apt download libxcursor1:${Arch3}
80-
apt download libxfixes3:${Arch3}
81-
apt download libpng16-16:${Arch3} || true
82-
apt download libpng16-16t64:${Arch3} || true
83-
apt download libicu66:${Arch3} || true
84-
apt download libicu70:${Arch3} || true
85-
apt download libicu74:${Arch3} || true
50+
apt download libicu74:${Arch3}
8651
apt download libfontconfig1:${Arch3} || true
8752
apt download libfontconfig:${Arch3} || true
8853
mkdir ../output_folder
@@ -97,12 +62,6 @@ rm -rf deb_folder output_folder
9762
sudo chmod 0755 "${PackagePath}/AppDir/opt/v2rayN/v2rayN"
9863
sudo chmod 0755 "${PackagePath}/AppDir/AppRun"
9964

100-
sudo apt install -y patchelf
101-
102-
pushd "${PackagePath}/AppDir/opt/v2rayN"
103-
patchelf --set-interpreter ${Interpreter} v2rayN
104-
popd
105-
10665
# desktop && PATH
10766

10867
wget "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"

0 commit comments

Comments
 (0)