Batyka/zaprett
1
0
Fork 0
mirror of https://github.com/egor-white/zaprett.git synced 2025-12-12 14:29:51 +05:00
Code Issues Packages Projects Releases 1 Wiki Activity

change sh to bash

Browse Source
This commit is contained in:
CherretGit
2025-11-01 16:43:40 +07:00
parent 490c8fa685
commit d11eb93be6
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rust/Cargo.lock generated
View File

@@ -327,14 +327,6 @@ version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424" checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424"
[[package]]
name = "iptables"
version = "0.6.0"
dependencies = [
"lazy_static",
"regex",
]
[[package]] [[package]]
name = "iptables" name = "iptables"
version = "0.6.0" version = "0.6.0"
@@ -959,7 +951,7 @@ dependencies = [
"clap", "clap",
"daemonize", "daemonize",
"getset", "getset",
"iptables 0.6.0 (git+https://github.com/sqlerrorthing/rust-iptables.git?branch=feat%2Fadd-android)", "iptables",
"libc", "libc",
"libnfqws", "libnfqws",
"log", "log",

12
rust/justfile
View File

@@ -1,4 +1,4 @@
set shell := ["sh", "-eu", "-c"] set shell := ["bash", "-eu", "-c"]
export ANDROID_API := "21" export ANDROID_API := "21"
export ANDROID_NDK_VERSION := "r27d-linux" export ANDROID_NDK_VERSION := "r27d-linux"
@@ -10,7 +10,7 @@ export NETFILTER_LIBS := TARGET + "/netfilter"
export NDK_HOME := TARGET + "/android-ndk-" + ANDROID_NDK_VERSION export NDK_HOME := TARGET + "/android-ndk-" + ANDROID_NDK_VERSION
_download_android_ndk: _download_android_ndk:
#!/usr/bin/env sh #!/usr/bin/env bash
if [ ! -d "{{NDK_HOME}}" ]; then if [ ! -d "{{NDK_HOME}}" ]; then
echo "Downloading ndk {{ANDROID_NDK_VERSION}} to {{NDK_HOME}}" echo "Downloading ndk {{ANDROID_NDK_VERSION}} to {{NDK_HOME}}"
TMPFILE="{{NDK_HOME}}.tmp" TMPFILE="{{NDK_HOME}}.tmp"
@@ -33,7 +33,7 @@ _download_android_ndk:
fi fi
_build_netfilter_libs target_arch: _build_netfilter_libs target_arch:
#!/usr/bin/env sh #!/usr/bin/env bash
if [ ! -d "{{NETFILTER_LIBS}}-{{target_arch}}" ]; then if [ ! -d "{{NETFILTER_LIBS}}-{{target_arch}}" ]; then
export PATCH="$(pwd)/libnetfilter_queue-android.patch" export PATCH="$(pwd)/libnetfilter_queue-android.patch"
@@ -77,7 +77,7 @@ _build_netfilter_libs target_arch:
fi fi
_instal_rust_target target: _instal_rust_target target:
#!/usr/bin/env sh #!/usr/bin/env bash
if ! rustup target list --installed | grep -q "{{target}}"; then if ! rustup target list --installed | grep -q "{{target}}"; then
echo "Installing missing target: {{target}}" echo "Installing missing target: {{target}}"
rustup target add "{{target}}" rustup target add "{{target}}"
@@ -86,11 +86,11 @@ _instal_rust_target target:
fi fi
prepare-android: _download_android_ndk prepare-android: _download_android_ndk
#!/usr/bin/env sh #!/usr/bin/env bash
cargo install cargo-ndk cargo install cargo-ndk
build-android *args: prepare-android build-android *args: prepare-android
#!/usr/bin/env sh #!/usr/bin/env bash
targets=("armv7-linux-androideabi" "aarch64-linux-android" "x86_64-linux-android") targets=("armv7-linux-androideabi" "aarch64-linux-android" "x86_64-linux-android")