diff --git a/.github/actions/build-linux-old/entrypoint.sh b/.github/actions/build-linux-old/entrypoint.sh index 2ed9769c..cbe774c4 100755 --- a/.github/actions/build-linux-old/entrypoint.sh +++ b/.github/actions/build-linux-old/entrypoint.sh @@ -117,7 +117,6 @@ then locale -a export LANG="C.UTF-8" export LC_ALL="C.UTF-8" - echo "python prefix!!!!!!! ($CUTTER_DEPS_PYTHON_PREFIX)" cmake \ -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/scripts/appimage_embed_python.sh b/scripts/appimage_embed_python.sh index c1e08382..70aa6e2e 100755 --- a/scripts/appimage_embed_python.sh +++ b/scripts/appimage_embed_python.sh @@ -7,14 +7,7 @@ if ! [[ $# -eq 2 ]]; then exit 1 fi -pwd -ls python_prefix=$(pkg-config --variable=prefix python3) - -echo "pprefix $python_prefix" -ls /github/workspace/cutter-deps/ -ls "$python_prefix" -ls "$python_prefix/bin" python_version=`$python_prefix/bin/python3 --version` python_version=${python_version##* } python_version=python${python_version%.*} diff --git a/scripts/fetch_deps.sh b/scripts/fetch_deps.sh index c28c7eff..d6d807e3 100755 --- a/scripts/fetch_deps.sh +++ b/scripts/fetch_deps.sh @@ -9,7 +9,7 @@ DEPS_BASE_URL=https://github.com/rizinorg/cutter-deps/releases/download/v16 if [ "$CUTTER_QT" == "5" ]; then DEPS_FILE_linux_x86_64=cutter-deps-q5-linux-x86_64.tar.gz - DEPS_SHA256_linux_x86_64=93636941493a19db8857c89f1f29c588b83ecebf283cc4489642ac50f46fef20 + DEPS_SHA256_linux_x86_64=3e86eb1c13b30b8f3908c6c8f38ca49287ccc110380b0810b534e6ebd7659bec DEPS_BASE_URL=https://github.com/karliss/cutter-deps/releases/download/qt6-test else DEPS_FILE_linux_x86_64=cutter-deps-linux-x86_64.tar.gz @@ -60,10 +60,6 @@ echo "$DEPS_SHA256 $DEPS_FILE" | ${SHA256SUM} -c - || exit 1 tar -xf "$DEPS_FILE" || exit 1 if [ -f relocate.sh ]; then - echo "-----------before relocate" - cat ./python/lib/pkgconfig/* || true ./relocate.sh || exit 1 - echo "-----------after relocate" - cat ./python/lib/pkgconfig/* || true fi