27
flake.nix
27
flake.nix
@@ -124,7 +124,6 @@
|
|||||||
[ -x "$PROOT_BIN" ] || { echo "proot not found/executable: $PROOT_BIN" >&2; exit 127; }
|
[ -x "$PROOT_BIN" ] || { echo "proot not found/executable: $PROOT_BIN" >&2; exit 127; }
|
||||||
[ -x "$EXTRACT_DIR''${APP_REL}" ] || { echo "app not found/executable: $EXTRACT_DIR''${APP_REL}" >&2; exit 127; }
|
[ -x "$EXTRACT_DIR''${APP_REL}" ] || { echo "app not found/executable: $EXTRACT_DIR''${APP_REL}" >&2; exit 127; }
|
||||||
|
|
||||||
# DNS for Android/termux (no /etc/resolv.conf in root)
|
|
||||||
mkdir -p "$EXTRACT_DIR/etc"
|
mkdir -p "$EXTRACT_DIR/etc"
|
||||||
cat > "$EXTRACT_DIR/etc/resolv.conf" <<'EOF'
|
cat > "$EXTRACT_DIR/etc/resolv.conf" <<'EOF'
|
||||||
nameserver 9.9.9.9
|
nameserver 9.9.9.9
|
||||||
@@ -133,24 +132,14 @@
|
|||||||
nameserver 1.0.0.1
|
nameserver 1.0.0.1
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
# run proot (no exec so trap can clean). Set BUNDLE_EXEC=1 to exec instead.
|
"''${PROOT_BIN}" \
|
||||||
if [ "''${BUNDLE_EXEC:-0}" = 1 ]; then
|
-R / \
|
||||||
exec "''${PROOT_BIN}" \
|
-b "$EXTRACT_DIR/nix:/nix" \
|
||||||
-R / \
|
-b "$EXTRACT_DIR/etc/resolv.conf:/etc/resolv.conf" \
|
||||||
-b "$EXTRACT_DIR/nix:/nix" \
|
-b /dev -b /proc -b /sys \
|
||||||
-b "$EXTRACT_DIR/etc/resolv.conf:/etc/resolv.conf" \
|
-w "$BUNDLE_PWD" \
|
||||||
-b /dev -b /proc -b /sys \
|
"$EXTRACT_DIR''${APP_REL}" "$@"
|
||||||
-w "$BUNDLE_PWD" \
|
exit $?
|
||||||
"$EXTRACT_DIR''${APP_REL}" "$@"
|
|
||||||
else
|
|
||||||
"''${PROOT_BIN}" \
|
|
||||||
-R / \
|
|
||||||
-b "$EXTRACT_DIR/nix:/nix" \
|
|
||||||
-b "$EXTRACT_DIR/etc/resolv.conf:/etc/resolv.conf" \
|
|
||||||
-b /dev -b /proc -b /sys \
|
|
||||||
-w "$BUNDLE_PWD" \
|
|
||||||
"$EXTRACT_DIR''${APP_REL}" "$@"
|
|
||||||
fi
|
|
||||||
|
|
||||||
__ARCHIVE_BELOW__
|
__ARCHIVE_BELOW__
|
||||||
SH
|
SH
|
||||||
|
|||||||
Reference in New Issue
Block a user