From 36d3328f67713ca67b867a99e8a9cd3ec43a21b7 Mon Sep 17 00:00:00 2001
From: neodiX <neodix@ton.org>
Date: Thu, 16 Jan 2025 21:33:37 +0400
Subject: [PATCH] avoid infinite loop when place in system bin dir

---
 .../build-ton-linux-x86-64-appimage.yml       |  5 --
 .../build-ton-linux-x86-64-portable.yml       | 49 -------------------
 .github/workflows/ton-arm64-macos.yml         | 40 ---------------
 assembly/appimage/AppRun                      |  6 +--
 4 files changed, 3 insertions(+), 97 deletions(-)
 delete mode 100644 .github/workflows/build-ton-linux-x86-64-portable.yml
 delete mode 100644 .github/workflows/ton-arm64-macos.yml

diff --git a/.github/workflows/build-ton-linux-x86-64-appimage.yml b/.github/workflows/build-ton-linux-x86-64-appimage.yml
index bc3c88d1..f012f656 100644
--- a/.github/workflows/build-ton-linux-x86-64-appimage.yml
+++ b/.github/workflows/build-ton-linux-x86-64-appimage.yml
@@ -47,11 +47,6 @@ jobs:
         ./create-appimages.sh
         rm -rf artifacts
 
-    - name: Quick test
-      run: |
-        ./appimages/artifacts/lite-client --appimage-extract 
-        ldd ./appimages/artifacts/squashfs-root/usr/bin/lite-client
-        ./appimages/artifacts/lite-client -V
 
     - name: Build TON libs
       run: |
diff --git a/.github/workflows/build-ton-linux-x86-64-portable.yml b/.github/workflows/build-ton-linux-x86-64-portable.yml
deleted file mode 100644
index 5752f468..00000000
--- a/.github/workflows/build-ton-linux-x86-64-portable.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-name: Ubuntu TON build (portable, x86-64)
-
-on: [push,workflow_dispatch,workflow_call]
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
-    runs-on: ${{ matrix.os }}
-
-    steps:
-    - name: Check out repository
-      uses: actions/checkout@v3
-      with:      
-        submodules: 'recursive'
-
-    - name: Install system libraries
-      run: |
-        sudo apt update
-        sudo apt install -y build-essential git cmake ninja-build libc++-dev libc++abi-dev
-        sudo apt remove libgsl-dev
-
-    - if: matrix.os == 'ubuntu-20.04'
-      run: |
-        sudo apt install -y manpages-dev software-properties-common
-        sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-        sudo apt update && sudo apt install gcc-11 g++-11
-
-    - if: matrix.os != 'ubuntu-24.04'
-      run: |
-        wget https://apt.llvm.org/llvm.sh
-        chmod +x llvm.sh
-        sudo ./llvm.sh 16 all
-
-    - name: Build TON
-      run: |
-        git submodule sync --recursive
-        git submodule update
-        cp assembly/native/build-ubuntu-portable.sh .
-        chmod +x build-ubuntu-portable.sh
-        ./build-ubuntu-portable.sh -t -a
-
-    - name: Upload artifacts
-      uses: actions/upload-artifact@master
-      with:
-        name: ton-binaries-${{ matrix.os }}
-        path: artifacts
diff --git a/.github/workflows/ton-arm64-macos.yml b/.github/workflows/ton-arm64-macos.yml
deleted file mode 100644
index f128680c..00000000
--- a/.github/workflows/ton-arm64-macos.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: MacOS TON build (portable, arm64)
-
-on: [push,workflow_dispatch,workflow_call]
-
-jobs:
-  build:
-    runs-on: macos-14
-
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        submodules: 'recursive'
-
-    - uses: cachix/install-nix-action@v23
-      with:
-        extra_nix_config: |
-          access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
-
-    - name: Build TON
-      run: |
-        git submodule sync --recursive
-        git submodule update
-        cp assembly/nix/build-macos-nix.sh .
-        chmod +x build-macos-nix.sh
-        ./build-macos-nix.sh -t
-
-    - name: Simple binaries test
-      run: |
-        sudo mv /nix/store /nix/store2
-        artifacts/validator-engine -V
-        artifacts/lite-client -V
-        artifacts/fift -V
-        artifacts/func -V
-        artifacts/tolk -v
-
-    - name: Upload artifacts
-      uses: actions/upload-artifact@master
-      with:
-        name: ton-arm64-macos-binaries
-        path: artifacts
diff --git a/assembly/appimage/AppRun b/assembly/appimage/AppRun
index 1250bd17..f3711856 100644
--- a/assembly/appimage/AppRun
+++ b/assembly/appimage/AppRun
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 export LD_LIBRARY_PATH="${APPDIR}/usr/lib:${LD_LIBRARY_PATH}"
-export PATH=$PATH:$(dirname "$0")/usr/bin
-cd "$(dirname $APPIMAGE)" & exec app "$@"
+cd "$(dirname "$0")"
+exec ./usr/bin/app "$@"