From 1e7dd2795babbdae04573cc03ce81b93614fc16f Mon Sep 17 00:00:00 2001 From: Azathothas Date: Fri, 6 Sep 2024 21:35:27 +0545 Subject: [PATCH] [+] Exclude AppImages from stripping https://github.com/Azathothas/Toolpacks/issues/28 --- .github/runners/aarch64-ubuntu.dockerfile | 4 +- .github/runners/alpine-builder.dockerfile | 1 + .../debian-builder-unstable.dockerfile | 4 +- .../runners/ubuntu-systemd-base.dockerfile | 4 +- .github/runners/x86_64-ubuntu.dockerfile | 4 +- .github/scripts/aarch64_Linux/bins/a-utils.sh | 2 +- .github/scripts/aarch64_Linux/bins/bash.sh | 2 +- .../scripts/aarch64_Linux/bins/bintools.sh | 4 +- .../scripts/aarch64_Linux/bins/binutils.sh | 4 +- .../scripts/aarch64_Linux/bins/btrfs-progs.sh | 2 +- .github/scripts/aarch64_Linux/bins/busybox.sh | 4 +- .../aarch64_Linux/bins/coreutils-vlang.sh | 2 +- .../scripts/aarch64_Linux/bins/coreutils.sh | 4 +- .../scripts/aarch64_Linux/bins/cryptsetup.sh | 2 +- .../scripts/aarch64_Linux/bins/dateutils.sh | 2 +- .github/scripts/aarch64_Linux/bins/dbus.sh | 2 +- .../aarch64_Linux/bins/desktop-file-utils.sh | 2 +- .../scripts/aarch64_Linux/bins/dropbear.sh | 4 +- .../scripts/aarch64_Linux/bins/e2fsprogs.sh | 2 +- .github/scripts/aarch64_Linux/bins/exfat.sh | 2 +- .../scripts/aarch64_Linux/bins/exfatprogs.sh | 2 +- .../scripts/aarch64_Linux/bins/findutils.sh | 2 +- .github/scripts/aarch64_Linux/bins/fio.sh | 2 +- .github/scripts/aarch64_Linux/bins/fuse3.sh | 2 +- .github/scripts/aarch64_Linux/bins/gawk.sh | 2 +- .github/scripts/aarch64_Linux/bins/gdb.sh | 2 +- .github/scripts/aarch64_Linux/bins/git.sh | 2 +- .github/scripts/aarch64_Linux/bins/grep.sh | 2 +- .github/scripts/aarch64_Linux/bins/gzip.sh | 2 +- .../aarch64_Linux/bins/hashcat-utils.sh | 2 +- .../aarch64_Linux/bins/html-xml-utils.sh | 2 +- .../scripts/aarch64_Linux/bins/iproute2.sh | 2 +- .github/scripts/aarch64_Linux/bins/iputils.sh | 2 +- .github/scripts/aarch64_Linux/bins/kmod.sh | 2 +- .../scripts/aarch64_Linux/bins/libarchive.sh | 2 +- .github/scripts/aarch64_Linux/bins/lkl.sh | 2 +- .../scripts/aarch64_Linux/bins/mtdutils.sh | 2 +- .../scripts/aarch64_Linux/bins/netcat-gnu.sh | 2 +- .github/scripts/aarch64_Linux/bins/netcat.sh | 2 +- .../scripts/aarch64_Linux/bins/nettools.sh | 2 +- .../scripts/aarch64_Linux/bins/nfs-utils.sh | 2 +- .github/scripts/aarch64_Linux/bins/openssh.sh | 2 +- .github/scripts/aarch64_Linux/bins/openssl.sh | 2 +- .github/scripts/aarch64_Linux/bins/outils.sh | 2 +- .../scripts/aarch64_Linux/bins/pax-utils.sh | 2 +- .github/scripts/aarch64_Linux/bins/procps.sh | 2 +- .github/scripts/aarch64_Linux/bins/python3.sh | 2 +- .github/scripts/aarch64_Linux/bins/radare2.sh | 2 +- .github/scripts/aarch64_Linux/bins/s6-dns.sh | 2 +- .../aarch64_Linux/bins/s6-linux-init.sh | 2 +- .../aarch64_Linux/bins/s6-linux-utils.sh | 2 +- .../aarch64_Linux/bins/s6-networking.sh | 2 +- .../aarch64_Linux/bins/s6-portable-utils.sh | 2 +- .github/scripts/aarch64_Linux/bins/s6-rc.sh | 2 +- .github/scripts/aarch64_Linux/bins/s6.sh | 2 +- .../scripts/aarch64_Linux/bins/sharutils.sh | 2 +- .../aarch64_Linux/bins/squashfs-tools-ng.sh | 2 +- .../aarch64_Linux/bins/squashfstools.sh | 2 +- .../scripts/aarch64_Linux/bins/squashfuse.sh | 2 +- .github/scripts/aarch64_Linux/bins/sudo.sh | 2 +- .github/scripts/aarch64_Linux/bins/sysstat.sh | 2 +- .github/scripts/aarch64_Linux/bins/tar.sh | 2 +- .../aarch64_Linux/bins/unionfs-fuse.sh | 2 +- .../scripts/aarch64_Linux/bins/util-linux.sh | 2 +- .../aarch64_Linux/bins/wirelesstools.sh | 2 +- .github/scripts/aarch64_Linux/bins/xz.sh | 2 +- .../scripts/aarch64_Linux/bins/zerotier.sh | 2 +- .github/scripts/aarch64_Linux/bins/zstd.sh | 2 +- .github/scripts/aarch64_Linux/build_debian.sh | 10 +- .github/scripts/aarch64_Linux/init_debian.sh | 4 +- .../scripts/arm64_v8a_Android/build_debian.sh | 8 +- .../scripts/arm64_v8a_Android/init_debian.sh | 4 +- .github/scripts/x86_64_Linux/bins/a-utils.sh | 4 +- .github/scripts/x86_64_Linux/bins/bash.sh | 4 +- .github/scripts/x86_64_Linux/bins/bintools.sh | 8 +- .github/scripts/x86_64_Linux/bins/binutils.sh | 8 +- .../scripts/x86_64_Linux/bins/btrfs-progs.sh | 4 +- .github/scripts/x86_64_Linux/bins/busybox.sh | 6 +- .../x86_64_Linux/bins/coreutils-vlang.sh | 4 +- .../scripts/x86_64_Linux/bins/coreutils.sh | 6 +- .../scripts/x86_64_Linux/bins/cryptsetup.sh | 4 +- .../scripts/x86_64_Linux/bins/dateutils.sh | 4 +- .github/scripts/x86_64_Linux/bins/dbus.sh | 4 +- .../x86_64_Linux/bins/desktop-file-utils.sh | 2 +- .github/scripts/x86_64_Linux/bins/dropbear.sh | 6 +- .../scripts/x86_64_Linux/bins/e2fsprogs.sh | 4 +- .github/scripts/x86_64_Linux/bins/exfat.sh | 4 +- .../scripts/x86_64_Linux/bins/exfatprogs.sh | 4 +- .../scripts/x86_64_Linux/bins/findutils.sh | 4 +- .github/scripts/x86_64_Linux/bins/fio.sh | 4 +- .github/scripts/x86_64_Linux/bins/fuse3.sh | 4 +- .github/scripts/x86_64_Linux/bins/gawk.sh | 4 +- .github/scripts/x86_64_Linux/bins/gdb.sh | 4 +- .github/scripts/x86_64_Linux/bins/git.sh | 4 +- .github/scripts/x86_64_Linux/bins/grep.sh | 4 +- .github/scripts/x86_64_Linux/bins/gzip.sh | 4 +- .../x86_64_Linux/bins/hashcat-utils.sh | 4 +- .../x86_64_Linux/bins/html-xml-utils.sh | 4 +- .github/scripts/x86_64_Linux/bins/iproute2.sh | 4 +- .github/scripts/x86_64_Linux/bins/iputils.sh | 4 +- .github/scripts/x86_64_Linux/bins/kmod.sh | 4 +- .../scripts/x86_64_Linux/bins/libarchive.sh | 4 +- .github/scripts/x86_64_Linux/bins/lklfuse.sh | 4 +- .github/scripts/x86_64_Linux/bins/mpv.sh | 91 +++++++++++++++++++ .github/scripts/x86_64_Linux/bins/mpv.yaml | 7 ++ .github/scripts/x86_64_Linux/bins/mtdutils.sh | 4 +- .../scripts/x86_64_Linux/bins/netcat-gnu.sh | 4 +- .github/scripts/x86_64_Linux/bins/netcat.sh | 4 +- .github/scripts/x86_64_Linux/bins/nettools.sh | 4 +- .../scripts/x86_64_Linux/bins/nfs-utils.sh | 4 +- .../x86_64_Linux/bins/nicotine-plus.sh | 89 ++++++++++++++++++ .../x86_64_Linux/bins/nicotine-plus.yaml | 7 ++ .github/scripts/x86_64_Linux/bins/openssh.sh | 4 +- .github/scripts/x86_64_Linux/bins/openssl.sh | 4 +- .github/scripts/x86_64_Linux/bins/outils.sh | 4 +- .../scripts/x86_64_Linux/bins/pax-utils.sh | 4 +- .github/scripts/x86_64_Linux/bins/procps.sh | 4 +- .github/scripts/x86_64_Linux/bins/python3.sh | 4 +- .github/scripts/x86_64_Linux/bins/radare2.sh | 4 +- .github/scripts/x86_64_Linux/bins/s6-dns.sh | 4 +- .../x86_64_Linux/bins/s6-linux-init.sh | 4 +- .../x86_64_Linux/bins/s6-linux-utils.sh | 4 +- .../x86_64_Linux/bins/s6-networking.sh | 4 +- .../x86_64_Linux/bins/s6-portable-utils.sh | 4 +- .github/scripts/x86_64_Linux/bins/s6-rc.sh | 4 +- .github/scripts/x86_64_Linux/bins/s6.sh | 4 +- .../scripts/x86_64_Linux/bins/sharutils.sh | 4 +- .../x86_64_Linux/bins/squashfs-tools-ng.sh | 4 +- .../x86_64_Linux/bins/squashfstools.sh | 4 +- .../scripts/x86_64_Linux/bins/squashfuse.sh | 2 +- .github/scripts/x86_64_Linux/bins/sudo.sh | 4 +- .github/scripts/x86_64_Linux/bins/sysstat.sh | 4 +- .github/scripts/x86_64_Linux/bins/tar.sh | 4 +- .../scripts/x86_64_Linux/bins/unionfs-fuse.sh | 4 +- .../scripts/x86_64_Linux/bins/util-linux.sh | 4 +- .../x86_64_Linux/bins/wirelesstools.sh | 4 +- .github/scripts/x86_64_Linux/bins/xz.sh | 4 +- .github/scripts/x86_64_Linux/bins/zerotier.sh | 2 +- .github/scripts/x86_64_Linux/bins/zstd.sh | 4 +- .github/scripts/x86_64_Linux/build_debian.sh | 12 +-- .github/scripts/x86_64_Linux/init_debian.sh | 4 +- 141 files changed, 422 insertions(+), 227 deletions(-) create mode 100644 .github/scripts/x86_64_Linux/bins/mpv.sh create mode 100644 .github/scripts/x86_64_Linux/bins/mpv.yaml create mode 100644 .github/scripts/x86_64_Linux/bins/nicotine-plus.sh create mode 100644 .github/scripts/x86_64_Linux/bins/nicotine-plus.yaml diff --git a/.github/runners/aarch64-ubuntu.dockerfile b/.github/runners/aarch64-ubuntu.dockerfile index 1589e343b..f686412fd 100644 --- a/.github/runners/aarch64-ubuntu.dockerfile +++ b/.github/runners/aarch64-ubuntu.dockerfile @@ -17,9 +17,9 @@ ENV INSTALL_SRC="https://bin.ajam.dev/aarch64_arm64_Linux" RUN </dev/null apk add hwloc-dev --latest --upgrade --no-interactive 2>/dev/null apk add idn2-utils --latest --upgrade --no-interactive 2>/dev/null + apk add imagemagick --latest --upgrade --no-interactive 2>/dev/null apk add imagemagick-dev --latest --upgrade --no-interactive 2>/dev/null apk add imagemagick-static --latest --upgrade --no-interactive 2>/dev/null apk add indent --latest --upgrade --no-interactive 2>/dev/null diff --git a/.github/runners/debian-builder-unstable.dockerfile b/.github/runners/debian-builder-unstable.dockerfile index 40b9f9303..b1906a40b 100644 --- a/.github/runners/debian-builder-unstable.dockerfile +++ b/.github/runners/debian-builder-unstable.dockerfile @@ -10,9 +10,9 @@ RUN </dev/null + find "$BASEUTILSDIR/a-utils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/a-utils/"* diff --git a/.github/scripts/aarch64_Linux/bins/bash.sh b/.github/scripts/aarch64_Linux/bins/bash.sh index ed24b8389..c34a4c926 100644 --- a/.github/scripts/aarch64_Linux/bins/bash.sh +++ b/.github/scripts/aarch64_Linux/bins/bash.sh @@ -34,7 +34,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/bash" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/bash/" && chmod -R 755 "$BASEUTILSDIR/bash/" #Strip - find "$BASEUTILSDIR/bash" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/bash" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null cp "$BASEUTILSDIR/bash/bash" "$BINDIR/bash" #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/bintools.sh b/.github/scripts/aarch64_Linux/bins/bintools.sh index 5438f4590..edde0fcac 100644 --- a/.github/scripts/aarch64_Linux/bins/bintools.sh +++ b/.github/scripts/aarch64_Linux/bins/bintools.sh @@ -55,7 +55,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/bintools" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/bintools" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/bintools/" && chmod -R 755 "$BASEUTILSDIR/bintools/" #Strip - find "$BASEUTILSDIR/bintools" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/bintools" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -125,7 +125,7 @@ unset PKG_CONFIG_PATH PKG_CONFIG_LIBDIR PKG_CONFIG_SYSROOT_DIR PKG_CONFIG_SYSTEM mkdir -p "$BASEUTILSDIR/bintools" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/bintools" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/bintools/" && chmod -R 755 "$BASEUTILSDIR/bintools/" #Strip - find "$BASEUTILSDIR/bintools" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/bintools" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/binutils.sh b/.github/scripts/aarch64_Linux/bins/binutils.sh index c0ce90b38..638e7bf1e 100644 --- a/.github/scripts/aarch64_Linux/bins/binutils.sh +++ b/.github/scripts/aarch64_Linux/bins/binutils.sh @@ -55,7 +55,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/binutils" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/binutils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/binutils/" && chmod -R 755 "$BASEUTILSDIR/binutils/" #Strip - find "$BASEUTILSDIR/binutils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/binutils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -125,7 +125,7 @@ unset PKG_CONFIG_PATH PKG_CONFIG_LIBDIR PKG_CONFIG_SYSROOT_DIR PKG_CONFIG_SYSTEM mkdir -p "$BASEUTILSDIR/binutils" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/binutils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/binutils/" && chmod -R 755 "$BASEUTILSDIR/binutils/" #Strip - find "$BASEUTILSDIR/binutils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/binutils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/btrfs-progs.sh b/.github/scripts/aarch64_Linux/bins/btrfs-progs.sh index 4ffe48faf..dd1306d18 100644 --- a/.github/scripts/aarch64_Linux/bins/btrfs-progs.sh +++ b/.github/scripts/aarch64_Linux/bins/btrfs-progs.sh @@ -36,7 +36,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/btrfs-progs" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/btrfs-progs" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/btrfs-progs/" && chmod -R 755 "$BASEUTILSDIR/btrfs-progs/" #Strip - find "$BASEUTILSDIR/btrfs-progs" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/btrfs-progs" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/busybox.sh b/.github/scripts/aarch64_Linux/bins/busybox.sh index e528e7f2e..c73930d88 100644 --- a/.github/scripts/aarch64_Linux/bins/busybox.sh +++ b/.github/scripts/aarch64_Linux/bins/busybox.sh @@ -34,7 +34,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then #sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/busybox" #sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/busybox/" && chmod -R 755 "$BASEUTILSDIR/busybox/" ##Strip - #find "$BASEUTILSDIR/busybox" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + #find "$BASEUTILSDIR/busybox" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 ##Build (MUSL) pushd "$($TMPDIRS)" >/dev/null 2>&1 @@ -67,7 +67,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then [ "$(find ./ -mindepth 1 -maxdepth 1)" ] && sudo rsync -av --copy-links "./." "$BASEUTILSDIR/busybox" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/busybox/" && chmod -R 755 "$BASEUTILSDIR/busybox/" #Strip - find "$BASEUTILSDIR/busybox" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/busybox" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/busybox/"* diff --git a/.github/scripts/aarch64_Linux/bins/coreutils-vlang.sh b/.github/scripts/aarch64_Linux/bins/coreutils-vlang.sh index 56c91c792..8fbbb5029 100644 --- a/.github/scripts/aarch64_Linux/bins/coreutils-vlang.sh +++ b/.github/scripts/aarch64_Linux/bins/coreutils-vlang.sh @@ -162,7 +162,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then [ "$(find ./ -mindepth 1 -maxdepth 1)" ] && sudo rsync -av --copy-links "./." "$BASEUTILSDIR/coreutils-vlang" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/coreutils-vlang/" && chmod -R 755 "$BASEUTILSDIR/coreutils-vlang/" #Strip - find "$BASEUTILSDIR/coreutils-vlang" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/coreutils-vlang" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/coreutils-vlang/"* diff --git a/.github/scripts/aarch64_Linux/bins/coreutils.sh b/.github/scripts/aarch64_Linux/bins/coreutils.sh index 87e40f928..b459b982d 100644 --- a/.github/scripts/aarch64_Linux/bins/coreutils.sh +++ b/.github/scripts/aarch64_Linux/bins/coreutils.sh @@ -34,7 +34,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/coreutils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/coreutils/" && chmod -R 755 "$BASEUTILSDIR/coreutils/" #Strip - find "$BASEUTILSDIR/coreutils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/coreutils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 ##Build (MUSL) pushd "$($TMPDIRS)" >/dev/null 2>&1 @@ -79,7 +79,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then [ "$(find ./ -mindepth 1 -maxdepth 1)" ] && sudo rsync -av --copy-links "./." "$BASEUTILSDIR/coreutils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/coreutils/" && chmod -R 755 "$BASEUTILSDIR/coreutils/" #Strip - find "$BASEUTILSDIR/coreutils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/coreutils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/coreutils/"* diff --git a/.github/scripts/aarch64_Linux/bins/cryptsetup.sh b/.github/scripts/aarch64_Linux/bins/cryptsetup.sh index 7d64f6f80..c0cf333a4 100644 --- a/.github/scripts/aarch64_Linux/bins/cryptsetup.sh +++ b/.github/scripts/aarch64_Linux/bins/cryptsetup.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/cryptsetup" ; sudo rsync -av --copy-links "./result-bin/bin/." "$BASEUTILSDIR/cryptsetup" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/cryptsetup/" && chmod -R 755 "$BASEUTILSDIR/cryptsetup/" #Strip - find "$BASEUTILSDIR/cryptsetup" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/cryptsetup" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/dateutils.sh b/.github/scripts/aarch64_Linux/bins/dateutils.sh index ed02fb5b2..cd99c1b07 100644 --- a/.github/scripts/aarch64_Linux/bins/dateutils.sh +++ b/.github/scripts/aarch64_Linux/bins/dateutils.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/dateutils" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/dateutils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/dateutils/" && chmod -R 755 "$BASEUTILSDIR/dateutils/" #Strip - find "$BASEUTILSDIR/dateutils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/dateutils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/dbus.sh b/.github/scripts/aarch64_Linux/bins/dbus.sh index a821cfa4b..b4bc26ee1 100644 --- a/.github/scripts/aarch64_Linux/bins/dbus.sh +++ b/.github/scripts/aarch64_Linux/bins/dbus.sh @@ -33,7 +33,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/libexec/." "$BASEUTILSDIR/dbus" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/dbus/" && chmod -R 755 "$BASEUTILSDIR/dbus/" #Strip - find "$BASEUTILSDIR/dbus" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/dbus" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/desktop-file-utils.sh b/.github/scripts/aarch64_Linux/bins/desktop-file-utils.sh index bb904ba70..9144fa228 100644 --- a/.github/scripts/aarch64_Linux/bins/desktop-file-utils.sh +++ b/.github/scripts/aarch64_Linux/bins/desktop-file-utils.sh @@ -31,7 +31,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/bin/." "$BINDIR/" sudo chown -R "$(whoami):$(whoami)" "$BINDIR/" && chmod -R 755 "$BINDIR/" #Strip - find "$BINDIR" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BINDIR" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 fi #-------------------------------------------------------# diff --git a/.github/scripts/aarch64_Linux/bins/dropbear.sh b/.github/scripts/aarch64_Linux/bins/dropbear.sh index adb8c7bff..f870ecb50 100644 --- a/.github/scripts/aarch64_Linux/bins/dropbear.sh +++ b/.github/scripts/aarch64_Linux/bins/dropbear.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then # mkdir -p "$BASEUTILSDIR/dropbear" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/dropbear" # sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/dropbear/" && chmod -R 755 "$BASEUTILSDIR/dropbear/" # #Strip - # find "$BASEUTILSDIR/dropbear" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + # find "$BASEUTILSDIR/dropbear" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null # nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 ##Build (alpine-musl) pushd "$($TMPDIRS)" >/dev/null 2>&1 @@ -60,7 +60,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then [ "$(find ./ -mindepth 1 -maxdepth 1)" ] && sudo rsync -av --copy-links "./." "$BASEUTILSDIR/dropbear" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/dropbear/" && chmod -R 755 "$BASEUTILSDIR/dropbear/" #Strip - find "$BASEUTILSDIR/dropbear" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/dropbear" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/dropbear/"* diff --git a/.github/scripts/aarch64_Linux/bins/e2fsprogs.sh b/.github/scripts/aarch64_Linux/bins/e2fsprogs.sh index f9a0f98c2..ad4055271 100644 --- a/.github/scripts/aarch64_Linux/bins/e2fsprogs.sh +++ b/.github/scripts/aarch64_Linux/bins/e2fsprogs.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/e2fsprogs" ; sudo rsync -av --copy-links "./result-bin/bin/." "$BASEUTILSDIR/e2fsprogs" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/e2fsprogs/" && chmod -R 755 "$BASEUTILSDIR/e2fsprogs/" #Strip - find "$BASEUTILSDIR/e2fsprogs" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/e2fsprogs" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/exfat.sh b/.github/scripts/aarch64_Linux/bins/exfat.sh index 0e6c66947..63d8b6564 100644 --- a/.github/scripts/aarch64_Linux/bins/exfat.sh +++ b/.github/scripts/aarch64_Linux/bins/exfat.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/exfat" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/exfat" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/exfat/" && chmod -R 755 "$BASEUTILSDIR/exfat/" #Strip - find "$BASEUTILSDIR/exfat" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/exfat" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/exfatprogs.sh b/.github/scripts/aarch64_Linux/bins/exfatprogs.sh index 6546052e3..f298e40f8 100644 --- a/.github/scripts/aarch64_Linux/bins/exfatprogs.sh +++ b/.github/scripts/aarch64_Linux/bins/exfatprogs.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/exfatprogs" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/exfatprogs" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/exfatprogs/" && chmod -R 755 "$BASEUTILSDIR/exfatprogs/" #Strip - find "$BASEUTILSDIR/exfatprogs" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/exfatprogs" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/findutils.sh b/.github/scripts/aarch64_Linux/bins/findutils.sh index e38b4404e..74d8bdaa0 100644 --- a/.github/scripts/aarch64_Linux/bins/findutils.sh +++ b/.github/scripts/aarch64_Linux/bins/findutils.sh @@ -35,7 +35,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/libexec/." "$BASEUTILSDIR/findutils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/findutils/" && chmod -R 755 "$BASEUTILSDIR/findutils/" #Strip - find "$BASEUTILSDIR/findutils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/findutils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/findutils/"* diff --git a/.github/scripts/aarch64_Linux/bins/fio.sh b/.github/scripts/aarch64_Linux/bins/fio.sh index 22abe6d8b..84b5cc4f1 100644 --- a/.github/scripts/aarch64_Linux/bins/fio.sh +++ b/.github/scripts/aarch64_Linux/bins/fio.sh @@ -66,7 +66,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then [ "$(find ./ -mindepth 1 -maxdepth 1)" ] && sudo rsync -av --copy-links "./." "$BASEUTILSDIR/fio" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/fio/" && chmod -R 755 "$BASEUTILSDIR/fio/" #Strip - find "$BASEUTILSDIR/fio" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/fio" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/fio/"* diff --git a/.github/scripts/aarch64_Linux/bins/fuse3.sh b/.github/scripts/aarch64_Linux/bins/fuse3.sh index 1e6f42aa0..f8880d363 100644 --- a/.github/scripts/aarch64_Linux/bins/fuse3.sh +++ b/.github/scripts/aarch64_Linux/bins/fuse3.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/fuse3" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/fuse3" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/fuse3/" && chmod -R 755 "$BASEUTILSDIR/fuse3/" #Strip - find "$BASEUTILSDIR/fuse3" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/fuse3" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/gawk.sh b/.github/scripts/aarch64_Linux/bins/gawk.sh index 82bc62fef..caf5ca3d6 100644 --- a/.github/scripts/aarch64_Linux/bins/gawk.sh +++ b/.github/scripts/aarch64_Linux/bins/gawk.sh @@ -35,7 +35,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/libexec/awk/." "$BASEUTILSDIR/gawk" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/gawk/" && chmod -R 755 "$BASEUTILSDIR/gawk/" #Strip - find "$BASEUTILSDIR/gawk" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/gawk" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/gawk/"* diff --git a/.github/scripts/aarch64_Linux/bins/gdb.sh b/.github/scripts/aarch64_Linux/bins/gdb.sh index 22d4d0d7c..9ffc864f1 100644 --- a/.github/scripts/aarch64_Linux/bins/gdb.sh +++ b/.github/scripts/aarch64_Linux/bins/gdb.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/gdb" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/gdb" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/gdb/" && chmod -R 755 "$BASEUTILSDIR/gdb/" #Strip - find "$BASEUTILSDIR/gdb" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/gdb" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/git.sh b/.github/scripts/aarch64_Linux/bins/git.sh index 8188f86c6..554017008 100644 --- a/.github/scripts/aarch64_Linux/bins/git.sh +++ b/.github/scripts/aarch64_Linux/bins/git.sh @@ -35,7 +35,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then rsync -av --copy-links --exclude="*/" "./bin/." "$BASEUTILSDIR/git" rsync -av --copy-links --exclude="*/" "./libexec/git-core/." "$BASEUTILSDIR/git" rsync -av --copy-links "./share/git-core/." "$BASEUTILSDIR/git" - find "$BASEUTILSDIR/git" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/git" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/grep.sh b/.github/scripts/aarch64_Linux/bins/grep.sh index 17ca9dbcd..1aba5f109 100644 --- a/.github/scripts/aarch64_Linux/bins/grep.sh +++ b/.github/scripts/aarch64_Linux/bins/grep.sh @@ -60,7 +60,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then [ "$(find ./ -mindepth 1 -maxdepth 1)" ] && sudo rsync -av --copy-links "./." "$BASEUTILSDIR/grep" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/grep/" && chmod -R 755 "$BASEUTILSDIR/grep/" #Strip - find "$BASEUTILSDIR/grep" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/grep" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/grep/"* diff --git a/.github/scripts/aarch64_Linux/bins/gzip.sh b/.github/scripts/aarch64_Linux/bins/gzip.sh index dd1a7399a..ea6f0961a 100644 --- a/.github/scripts/aarch64_Linux/bins/gzip.sh +++ b/.github/scripts/aarch64_Linux/bins/gzip.sh @@ -34,7 +34,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/gzip" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/gzip/" && chmod -R 755 "$BASEUTILSDIR/gzip/" #Strip - find "$BASEUTILSDIR/gzip" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/gzip" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/gzip/"* diff --git a/.github/scripts/aarch64_Linux/bins/hashcat-utils.sh b/.github/scripts/aarch64_Linux/bins/hashcat-utils.sh index 656fbe319..1b6acba26 100644 --- a/.github/scripts/aarch64_Linux/bins/hashcat-utils.sh +++ b/.github/scripts/aarch64_Linux/bins/hashcat-utils.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/hashcat-utils" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/hashcat-utils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/hashcat-utils/" && chmod -R 755 "$BASEUTILSDIR/hashcat-utils/" #Strip - find "$BASEUTILSDIR/hashcat-utils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/hashcat-utils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null find "$BASEUTILSDIR/hashcat-utils" -type f -executable -name "*.bin" -exec sh -c 'mv "$1" "${1%.bin}"' _ {} \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# diff --git a/.github/scripts/aarch64_Linux/bins/html-xml-utils.sh b/.github/scripts/aarch64_Linux/bins/html-xml-utils.sh index 0078344ec..0607237a9 100644 --- a/.github/scripts/aarch64_Linux/bins/html-xml-utils.sh +++ b/.github/scripts/aarch64_Linux/bins/html-xml-utils.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/html-xml-utils" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/html-xml-utils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/html-xml-utils/" && chmod -R 755 "$BASEUTILSDIR/html-xml-utils/" #Strip - find "$BASEUTILSDIR/html-xml-utils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/html-xml-utils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/iproute2.sh b/.github/scripts/aarch64_Linux/bins/iproute2.sh index 44dd9d43c..3fa84e8bc 100644 --- a/.github/scripts/aarch64_Linux/bins/iproute2.sh +++ b/.github/scripts/aarch64_Linux/bins/iproute2.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/iproute2" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/iproute2" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/iproute2/" && chmod -R 755 "$BASEUTILSDIR/iproute2/" #Strip - find "$BASEUTILSDIR/iproute2" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/iproute2" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/iputils.sh b/.github/scripts/aarch64_Linux/bins/iputils.sh index 908737504..4ef01b7d7 100644 --- a/.github/scripts/aarch64_Linux/bins/iputils.sh +++ b/.github/scripts/aarch64_Linux/bins/iputils.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/iputils" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/iputils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/iputils/" && chmod -R 755 "$BASEUTILSDIR/iputils/" #Strip - find "$BASEUTILSDIR/iputils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/iputils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/kmod.sh b/.github/scripts/aarch64_Linux/bins/kmod.sh index 03a3653b6..2ea5d775f 100644 --- a/.github/scripts/aarch64_Linux/bins/kmod.sh +++ b/.github/scripts/aarch64_Linux/bins/kmod.sh @@ -34,7 +34,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/kmod" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/kmod/" && chmod -R 755 "$BASEUTILSDIR/kmod/" #Strip - find "$BASEUTILSDIR/kmod" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/kmod" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/kmod/"* diff --git a/.github/scripts/aarch64_Linux/bins/libarchive.sh b/.github/scripts/aarch64_Linux/bins/libarchive.sh index 75c4e480d..f5a433ee9 100644 --- a/.github/scripts/aarch64_Linux/bins/libarchive.sh +++ b/.github/scripts/aarch64_Linux/bins/libarchive.sh @@ -34,7 +34,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/libarchive" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/libarchive/" && chmod -R 755 "$BASEUTILSDIR/libarchive/" #Strip - find "$BASEUTILSDIR/libarchive" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/libarchive" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/lkl.sh b/.github/scripts/aarch64_Linux/bins/lkl.sh index df57ae310..f95d99cfd 100644 --- a/.github/scripts/aarch64_Linux/bins/lkl.sh +++ b/.github/scripts/aarch64_Linux/bins/lkl.sh @@ -35,7 +35,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then #mkdir -p "$BASEUTILSDIR/lkl" ; sudo rsync -av --copy-links "./result-bin/bin/." "$BASEUTILSDIR/lkl" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/lkl/" && chmod -R 755 "$BASEUTILSDIR/lkl/" #Strip - find "$BASEUTILSDIR/lkl" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/lkl" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/mtdutils.sh b/.github/scripts/aarch64_Linux/bins/mtdutils.sh index 7a832ada9..4fea8ce58 100644 --- a/.github/scripts/aarch64_Linux/bins/mtdutils.sh +++ b/.github/scripts/aarch64_Linux/bins/mtdutils.sh @@ -33,7 +33,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/libexec/mtd-utils/." "$BASEUTILSDIR/mtdutils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/mtdutils/" && chmod -R 755 "$BASEUTILSDIR/mtdutils/" #Strip - find "$BASEUTILSDIR/mtdutils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/mtdutils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/netcat-gnu.sh b/.github/scripts/aarch64_Linux/bins/netcat-gnu.sh index 9db376185..0d1f4b53e 100644 --- a/.github/scripts/aarch64_Linux/bins/netcat-gnu.sh +++ b/.github/scripts/aarch64_Linux/bins/netcat-gnu.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/netcat-gnu" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/netcat-gnu" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/netcat-gnu/" && chmod -R 755 "$BASEUTILSDIR/netcat-gnu/" #Strip - find "$BASEUTILSDIR/netcat-gnu" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/netcat-gnu" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/netcat.sh b/.github/scripts/aarch64_Linux/bins/netcat.sh index c8a2a8874..bf32e4886 100644 --- a/.github/scripts/aarch64_Linux/bins/netcat.sh +++ b/.github/scripts/aarch64_Linux/bins/netcat.sh @@ -34,7 +34,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then cp "$BASEUTILSDIR/netcat/nc" "$BASEUTILSDIR/netcat/netcat" cp "$BASEUTILSDIR/netcat/netcat" "$BINDIR/netcat" #Strip - find "$BASEUTILSDIR/netcat" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/netcat" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/nettools.sh b/.github/scripts/aarch64_Linux/bins/nettools.sh index 6e96daee9..493f03526 100644 --- a/.github/scripts/aarch64_Linux/bins/nettools.sh +++ b/.github/scripts/aarch64_Linux/bins/nettools.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/nettools" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/nettools" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/nettools/" && chmod -R 755 "$BASEUTILSDIR/nettools/" #Strip - find "$BASEUTILSDIR/nettools" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/nettools" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/nfs-utils.sh b/.github/scripts/aarch64_Linux/bins/nfs-utils.sh index c462b6bae..8d0af3197 100644 --- a/.github/scripts/aarch64_Linux/bins/nfs-utils.sh +++ b/.github/scripts/aarch64_Linux/bins/nfs-utils.sh @@ -33,7 +33,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/nfs-utils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/nfs-utils/" && chmod -R 755 "$BASEUTILSDIR/nfs-utils/" #Strip - find "$BASEUTILSDIR/nfs-utils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/nfs-utils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/openssh.sh b/.github/scripts/aarch64_Linux/bins/openssh.sh index c2d694b62..26e1bb4b1 100644 --- a/.github/scripts/aarch64_Linux/bins/openssh.sh +++ b/.github/scripts/aarch64_Linux/bins/openssh.sh @@ -37,7 +37,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then rm -rf "./bin/"*.tgz && find "./bin" -empty -delete #strip cd "$(find "./bin" -maxdepth 1 -type d -name '*openssh*')" - find "." -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "." -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #Copy mkdir -p "$BASEUTILSDIR/openssh" rsync -av --copy-links "./bin/." "$BASEUTILSDIR/openssh" diff --git a/.github/scripts/aarch64_Linux/bins/openssl.sh b/.github/scripts/aarch64_Linux/bins/openssl.sh index cf949a181..3fc4a8448 100644 --- a/.github/scripts/aarch64_Linux/bins/openssl.sh +++ b/.github/scripts/aarch64_Linux/bins/openssl.sh @@ -34,7 +34,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result-bin/bin/." "$BASEUTILSDIR/openssl" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/openssl/" && chmod -R 755 "$BASEUTILSDIR/openssl/" #Strip - find "$BASEUTILSDIR/openssl" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/openssl" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/openssl/"* diff --git a/.github/scripts/aarch64_Linux/bins/outils.sh b/.github/scripts/aarch64_Linux/bins/outils.sh index 8435a3089..b565b9f51 100644 --- a/.github/scripts/aarch64_Linux/bins/outils.sh +++ b/.github/scripts/aarch64_Linux/bins/outils.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/outils" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/outils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/outils/" && chmod -R 755 "$BASEUTILSDIR/outils/" #Strip - find "$BASEUTILSDIR/outils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/outils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/pax-utils.sh b/.github/scripts/aarch64_Linux/bins/pax-utils.sh index a33ec3256..2b4903315 100644 --- a/.github/scripts/aarch64_Linux/bins/pax-utils.sh +++ b/.github/scripts/aarch64_Linux/bins/pax-utils.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/pax-utils" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/pax-utils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/pax-utils/" && chmod -R 755 "$BASEUTILSDIR/pax-utils/" #Strip - find "$BASEUTILSDIR/pax-utils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/pax-utils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/procps.sh b/.github/scripts/aarch64_Linux/bins/procps.sh index 920116276..98ca45b5e 100644 --- a/.github/scripts/aarch64_Linux/bins/procps.sh +++ b/.github/scripts/aarch64_Linux/bins/procps.sh @@ -34,7 +34,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/procps" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/procps/" && chmod -R 755 "$BASEUTILSDIR/procps/" #Strip - find "$BASEUTILSDIR/procps" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/procps" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/procps/"* diff --git a/.github/scripts/aarch64_Linux/bins/python3.sh b/.github/scripts/aarch64_Linux/bins/python3.sh index 915468654..809261a72 100644 --- a/.github/scripts/aarch64_Linux/bins/python3.sh +++ b/.github/scripts/aarch64_Linux/bins/python3.sh @@ -33,7 +33,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/python3" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/python3/" && chmod -R 755 "$BASEUTILSDIR/python3/" #Strip - find "$BASEUTILSDIR/python3" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/python3" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #Test docker run --privileged -it --rm --network="bridge" -v "$BASEUTILSDIR/python3:/mnt" "alpine" "/mnt/python3" --version diff --git a/.github/scripts/aarch64_Linux/bins/radare2.sh b/.github/scripts/aarch64_Linux/bins/radare2.sh index 4309e2745..b262c5063 100644 --- a/.github/scripts/aarch64_Linux/bins/radare2.sh +++ b/.github/scripts/aarch64_Linux/bins/radare2.sh @@ -53,7 +53,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then [ "$(find ./ -mindepth 1 -maxdepth 1)" ] && sudo rsync -av --copy-links "./." "$BASEUTILSDIR/radare2" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/radare2/" && chmod -R 755 "$BASEUTILSDIR/radare2/" #Strip - find "$BASEUTILSDIR/radare2" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/radare2" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/radare2/"* diff --git a/.github/scripts/aarch64_Linux/bins/s6-dns.sh b/.github/scripts/aarch64_Linux/bins/s6-dns.sh index aca6634a9..ee50ea54a 100644 --- a/.github/scripts/aarch64_Linux/bins/s6-dns.sh +++ b/.github/scripts/aarch64_Linux/bins/s6-dns.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/s6-dns" ; sudo rsync -av --copy-links "./result-bin/bin/." "$BASEUTILSDIR/s6-dns" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/s6-dns/" && chmod -R 755 "$BASEUTILSDIR/s6-dns/" #Strip - find "$BASEUTILSDIR/s6-dns" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/s6-dns" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/s6-linux-init.sh b/.github/scripts/aarch64_Linux/bins/s6-linux-init.sh index 661f668f4..7f54091a2 100644 --- a/.github/scripts/aarch64_Linux/bins/s6-linux-init.sh +++ b/.github/scripts/aarch64_Linux/bins/s6-linux-init.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/s6-linux-init" ; sudo rsync -av --copy-links "./result-bin/bin/." "$BASEUTILSDIR/s6-linux-init" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/s6-linux-init/" && chmod -R 755 "$BASEUTILSDIR/s6-linux-init/" #Strip - find "$BASEUTILSDIR/s6-linux-init" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/s6-linux-init" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/s6-linux-utils.sh b/.github/scripts/aarch64_Linux/bins/s6-linux-utils.sh index dc35d2c42..df1ea3746 100644 --- a/.github/scripts/aarch64_Linux/bins/s6-linux-utils.sh +++ b/.github/scripts/aarch64_Linux/bins/s6-linux-utils.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/s6-linux-utils" ; sudo rsync -av --copy-links "./result-bin/bin/." "$BASEUTILSDIR/s6-linux-utils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/s6-linux-utils/" && chmod -R 755 "$BASEUTILSDIR/s6-linux-utils/" #Strip - find "$BASEUTILSDIR/s6-linux-utils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/s6-linux-utils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/s6-networking.sh b/.github/scripts/aarch64_Linux/bins/s6-networking.sh index 8a5a52f45..1cd40ef9b 100644 --- a/.github/scripts/aarch64_Linux/bins/s6-networking.sh +++ b/.github/scripts/aarch64_Linux/bins/s6-networking.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/s6-networking" ; sudo rsync -av --copy-links "./result-bin/bin/." "$BASEUTILSDIR/s6-networking" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/s6-networking/" && chmod -R 755 "$BASEUTILSDIR/s6-networking/" #Strip - find "$BASEUTILSDIR/s6-networking" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/s6-networking" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/s6-portable-utils.sh b/.github/scripts/aarch64_Linux/bins/s6-portable-utils.sh index b44df441a..94dc984b2 100644 --- a/.github/scripts/aarch64_Linux/bins/s6-portable-utils.sh +++ b/.github/scripts/aarch64_Linux/bins/s6-portable-utils.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/s6-portable-utils" ; sudo rsync -av --copy-links "./result-bin/bin/." "$BASEUTILSDIR/s6-portable-utils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/s6-portable-utils/" && chmod -R 755 "$BASEUTILSDIR/s6-portable-utils/" #Strip - find "$BASEUTILSDIR/s6-portable-utils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/s6-portable-utils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/s6-rc.sh b/.github/scripts/aarch64_Linux/bins/s6-rc.sh index 4913fe418..d15204675 100644 --- a/.github/scripts/aarch64_Linux/bins/s6-rc.sh +++ b/.github/scripts/aarch64_Linux/bins/s6-rc.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/s6-rc" ; sudo rsync -av --copy-links "./result-bin/bin/." "$BASEUTILSDIR/s6-rc" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/s6-rc/" && chmod -R 755 "$BASEUTILSDIR/s6-rc/" #Strip - find "$BASEUTILSDIR/s6-rc" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/s6-rc" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/s6.sh b/.github/scripts/aarch64_Linux/bins/s6.sh index b53f8f63d..7a9236e97 100644 --- a/.github/scripts/aarch64_Linux/bins/s6.sh +++ b/.github/scripts/aarch64_Linux/bins/s6.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/s6" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/s6" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/s6/" && chmod -R 755 "$BASEUTILSDIR/s6/" #Strip - find "$BASEUTILSDIR/s6" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/s6" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/sharutils.sh b/.github/scripts/aarch64_Linux/bins/sharutils.sh index 9f99a9786..df0a8b187 100644 --- a/.github/scripts/aarch64_Linux/bins/sharutils.sh +++ b/.github/scripts/aarch64_Linux/bins/sharutils.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/sharutils" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/sharutils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/sharutils/" && chmod -R 755 "$BASEUTILSDIR/sharutils/" #Strip - find "$BASEUTILSDIR/sharutils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/sharutils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/squashfs-tools-ng.sh b/.github/scripts/aarch64_Linux/bins/squashfs-tools-ng.sh index 6e420e625..ac1b3cdec 100644 --- a/.github/scripts/aarch64_Linux/bins/squashfs-tools-ng.sh +++ b/.github/scripts/aarch64_Linux/bins/squashfs-tools-ng.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/squashfs-tools-ng" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/squashfs-tools-ng" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/squashfs-tools-ng/" && chmod -R 755 "$BASEUTILSDIR/squashfs-tools-ng/" #Strip - find "$BASEUTILSDIR/squashfs-tools-ng" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/squashfs-tools-ng" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/squashfstools.sh b/.github/scripts/aarch64_Linux/bins/squashfstools.sh index ff51ea8b3..b83b6add0 100644 --- a/.github/scripts/aarch64_Linux/bins/squashfstools.sh +++ b/.github/scripts/aarch64_Linux/bins/squashfstools.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/squashfstools" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/squashfstools" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/squashfstools/" && chmod -R 755 "$BASEUTILSDIR/squashfstools/" #Strip - find "$BASEUTILSDIR/squashfstools" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/squashfstools" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/squashfuse.sh b/.github/scripts/aarch64_Linux/bins/squashfuse.sh index d504ce3fa..33d298c0b 100644 --- a/.github/scripts/aarch64_Linux/bins/squashfuse.sh +++ b/.github/scripts/aarch64_Linux/bins/squashfuse.sh @@ -31,7 +31,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/bin/." "$BINDIR/" sudo chown -R "$(whoami):$(whoami)" "$BINDIR/" && chmod -R 755 "$BINDIR/" #Strip - find "$BINDIR" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BINDIR" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 fi #-------------------------------------------------------# diff --git a/.github/scripts/aarch64_Linux/bins/sudo.sh b/.github/scripts/aarch64_Linux/bins/sudo.sh index 6e6d97683..98218e05c 100644 --- a/.github/scripts/aarch64_Linux/bins/sudo.sh +++ b/.github/scripts/aarch64_Linux/bins/sudo.sh @@ -35,7 +35,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links --exclude="*/" "./result/etc/." "$BASEUTILSDIR/sudo" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/sudo/" && chmod -R 755 "$BASEUTILSDIR/sudo/" #Strip - find "$BASEUTILSDIR/sudo" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/sudo" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/sudo/"* diff --git a/.github/scripts/aarch64_Linux/bins/sysstat.sh b/.github/scripts/aarch64_Linux/bins/sysstat.sh index b1ff7fd56..d266d016e 100644 --- a/.github/scripts/aarch64_Linux/bins/sysstat.sh +++ b/.github/scripts/aarch64_Linux/bins/sysstat.sh @@ -49,7 +49,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then [ "$(find ./ -mindepth 1 -maxdepth 1)" ] && sudo rsync -av --copy-links "./." "$BASEUTILSDIR/sysstat" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/sysstat/" && chmod -R 755 "$BASEUTILSDIR/sysstat/" #Strip - find "$BASEUTILSDIR/sysstat" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/sysstat" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/sysstat/"* diff --git a/.github/scripts/aarch64_Linux/bins/tar.sh b/.github/scripts/aarch64_Linux/bins/tar.sh index 4aa5a4a89..d7fb24ad9 100644 --- a/.github/scripts/aarch64_Linux/bins/tar.sh +++ b/.github/scripts/aarch64_Linux/bins/tar.sh @@ -35,7 +35,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/libexec/." "$BASEUTILSDIR/tar" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/tar/" && chmod -R 755 "$BASEUTILSDIR/tar/" #Strip - find "$BASEUTILSDIR/tar" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/tar" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/tar/"* diff --git a/.github/scripts/aarch64_Linux/bins/unionfs-fuse.sh b/.github/scripts/aarch64_Linux/bins/unionfs-fuse.sh index 8c5a12844..bf8ad35b9 100644 --- a/.github/scripts/aarch64_Linux/bins/unionfs-fuse.sh +++ b/.github/scripts/aarch64_Linux/bins/unionfs-fuse.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/unionfs-fuse" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/unionfs-fuse" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/unionfs-fuse/" && chmod -R 755 "$BASEUTILSDIR/unionfs-fuse/" #Strip - find "$BASEUTILSDIR/unionfs-fuse" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/unionfs-fuse" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/util-linux.sh b/.github/scripts/aarch64_Linux/bins/util-linux.sh index ffb130634..e61e27c08 100644 --- a/.github/scripts/aarch64_Linux/bins/util-linux.sh +++ b/.github/scripts/aarch64_Linux/bins/util-linux.sh @@ -34,7 +34,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result-bin/bin/." "$BASEUTILSDIR/util-linux" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/util-linux/" && chmod -R 755 "$BASEUTILSDIR/util-linux/" #Strip - find "$BASEUTILSDIR/util-linux" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/util-linux" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/util-linux/"* diff --git a/.github/scripts/aarch64_Linux/bins/wirelesstools.sh b/.github/scripts/aarch64_Linux/bins/wirelesstools.sh index 30ad67770..8ba708e05 100644 --- a/.github/scripts/aarch64_Linux/bins/wirelesstools.sh +++ b/.github/scripts/aarch64_Linux/bins/wirelesstools.sh @@ -30,7 +30,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then NIXPKGS_ALLOW_BROKEN="1" NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM="1" nix-build '' --attr "pkgsStatic.wirelesstools" --cores "$(($(nproc)+1))" --max-jobs "$(($(nproc)+1))" --log-format bar-with-logs mkdir -p "$BASEUTILSDIR/wirelesstools" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/wirelesstools" #Strip - find "$BASEUTILSDIR/wirelesstools" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/wirelesstools" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta diff --git a/.github/scripts/aarch64_Linux/bins/xz.sh b/.github/scripts/aarch64_Linux/bins/xz.sh index 06c3b7f63..219dbc31f 100644 --- a/.github/scripts/aarch64_Linux/bins/xz.sh +++ b/.github/scripts/aarch64_Linux/bins/xz.sh @@ -34,7 +34,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result-bin/bin/." "$BASEUTILSDIR/xz" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/xz/" && chmod -R 755 "$BASEUTILSDIR/xz/" #Strip - find "$BASEUTILSDIR/xz" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/xz" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/xz/"* diff --git a/.github/scripts/aarch64_Linux/bins/zerotier.sh b/.github/scripts/aarch64_Linux/bins/zerotier.sh index a70341ef1..85882f583 100644 --- a/.github/scripts/aarch64_Linux/bins/zerotier.sh +++ b/.github/scripts/aarch64_Linux/bins/zerotier.sh @@ -47,7 +47,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then rsync -av --copy-links --checksum "./zerotier-idtool" "/build-bins/zerotier-idtool" rsync -av --copy-links --checksum "./zerotier-one" "/build-bins/zerotier-one" #strip & info - find "/build-bins" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "/build-bins" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null find "/build-bins" -type f -exec file {} \; 2>/dev/null ' #Copy diff --git a/.github/scripts/aarch64_Linux/bins/zstd.sh b/.github/scripts/aarch64_Linux/bins/zstd.sh index 8853997f9..22aaeef11 100644 --- a/.github/scripts/aarch64_Linux/bins/zstd.sh +++ b/.github/scripts/aarch64_Linux/bins/zstd.sh @@ -33,7 +33,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result-bin/bin/." "$BASEUTILSDIR/zstd" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/zstd/" && chmod -R 755 "$BASEUTILSDIR/zstd/" #Strip - find "$BASEUTILSDIR/zstd" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/zstd" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/zstd/"* diff --git a/.github/scripts/aarch64_Linux/build_debian.sh b/.github/scripts/aarch64_Linux/build_debian.sh index 6447da30c..1e4ef67f8 100644 --- a/.github/scripts/aarch64_Linux/build_debian.sh +++ b/.github/scripts/aarch64_Linux/build_debian.sh @@ -183,7 +183,7 @@ set +x #Chmod +xwr find "$BINDIR" -maxdepth 1 -type f -exec chmod +xwr {} \; 2>/dev/null #Strip - find "$BINDIR" -maxdepth 1 -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BINDIR" -maxdepth 1 -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #Rename anything with *_amd* find "$BINDIR" -type f -name '*_Linux' -exec sh -c 'newname=$(echo "$1" | sed "s/_aarch64_arm64_Linux//"); mv "$1" "$newname"' sh {} \; #-------------------------------------------------------# @@ -191,7 +191,7 @@ set +x #Chmod +xwr find "$BASEUTILSDIR" -maxdepth 1 -type f -exec chmod +xwr {} \; 2>/dev/null #Strip - find "$BASEUTILSDIR" -maxdepth 1 -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR" -maxdepth 1 -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #Rename anything with *_amd* find "$BASEUTILSDIR" -type f -name '*_Linux' -exec sh -c 'newname=$(echo "$1" | sed "s/_aarch64_arm64_Linux//"); mv "$1" "$newname"' sh {} \; #-------------------------------------------------------# @@ -232,7 +232,7 @@ set +x #Chmod +xwr find "$BINDIR" -maxdepth 1 -type f -exec chmod +xwr {} \; 2>/dev/null #Strip - find "$BINDIR" -maxdepth 1 -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BINDIR" -maxdepth 1 -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #Rename anything with *_amd* find "$BINDIR" -type f -name '*_Linux' -exec sh -c 'newname=$(echo "$1" | sed "s/_aarch64_arm64_Linux//"); mv "$1" "$newname"' sh {} \; #File @@ -256,7 +256,7 @@ set +x cd "$BASEUTILSDIR" rclone_base_dw() { - rclone copy "r2:/bin/aarch64_arm64_Linux/Baseutils/" "." --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.txt" --exclude="*.tmp" --exclude="*.upx" --exclude="*.yaml" --exclude="*.zip" --user-agent="$USER_AGENT" --buffer-size="10M" --s3-upload-concurrency="50" --s3-chunk-size="10M" --multi-thread-streams="50" --checkers="2000" --transfers="100" --retries="10" --check-first --checksum --copy-links --fast-list --progress + rclone copy "r2:/bin/aarch64_arm64_Linux/Baseutils/" "." --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.txt" --exclude="*.tmp" --exclude="*.upx" --exclude="*.yaml" --exclude="*.zip"--exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.txt" --exclude="*.tmp" --exclude="*.upx" --exclude="*.yaml" --exclude="*.zip" --user-agent="$USER_AGENT" --buffer-size="10M" --s3-upload-concurrency="50" --s3-chunk-size="10M" --multi-thread-streams="50" --checkers="2000" --transfers="100" --retries="10" --check-first --checksum --copy-links --fast-list --progress } export -f rclone_base_dw sleep 60 && rclone_base_dw ; sleep 60 && rclone_base_dw ; sleep 60 && rclone_base_dw @@ -264,7 +264,7 @@ set +x #Chmod +xwr find "$BASEUTILSDIR" -type f -exec chmod +xwr {} \; 2>/dev/null #Strip - find "$BASEUTILSDIR" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #Rename anything with *_amd* find "$BASEUTILSDIR" -type f -name '*_Linux' -exec sh -c 'newname=$(echo "$1" | sed "s/_aarch64_arm64_Linux//"); mv "$1" "$newname"' sh {} \; #File diff --git a/.github/scripts/aarch64_Linux/init_debian.sh b/.github/scripts/aarch64_Linux/init_debian.sh index 693e83752..d7d8d43de 100644 --- a/.github/scripts/aarch64_Linux/init_debian.sh +++ b/.github/scripts/aarch64_Linux/init_debian.sh @@ -130,12 +130,12 @@ sudo apt-get update -y 2>/dev/null sudo apt-get install apt-transport-https apt-utils ca-certificates coreutils gnupg2 moreutils software-properties-common util-linux -y 2>/dev/null ; sudo apt-get update -y 2>/dev/null #Install Build Des - sudo apt-get install aria2 automake bc binutils b3sum build-essential ca-certificates ccache diffutils dos2unix gawk lzip jq libtool libtool-bin make musl musl-dev musl-tools p7zip-full rsync texinfo wget -y 2>/dev/null + sudo apt-get install aria2 automake bc binutils b3sum build-essential ca-certificates ccache diffutils dos2unix gawk imagemagick lzip jq libtool libtool-bin make musl musl-dev musl-tools p7zip-full rsync texinfo wget -y 2>/dev/null sudo apt-get install -y --no-install-recommends autoconf automake autopoint binutils bison build-essential byacc ca-certificates clang flex file jq libtool libtool-bin patch patchelf pkg-config qemu-user-static scons wget 2>/dev/null sudo apt-get install devscripts -y --no-install-recommends 2>/dev/null sudo apt-get install cmake -y #Re - sudo apt-get install aria2 automake bc binutils b3sum build-essential ca-certificates ccache diffutils dos2unix gawk lzip jq libtool libtool-bin make musl musl-dev musl-tools p7zip-full rsync texinfo wget -y 2>/dev/null + sudo apt-get install aria2 automake bc binutils b3sum build-essential ca-certificates ccache diffutils dos2unix gawk imagemagick lzip jq libtool libtool-bin make musl musl-dev musl-tools p7zip-full rsync texinfo wget -y 2>/dev/null sudo apt-get install -y --no-install-recommends autoconf automake autopoint binutils bison build-essential byacc ca-certificates clang flex file jq libtool libtool-bin patch patchelf pkg-config qemu-user-static scons wget 2>/dev/null sudo apt-get install devscripts -y --no-install-recommends 2>/dev/null sudo apt-get install cmake -y diff --git a/.github/scripts/arm64_v8a_Android/build_debian.sh b/.github/scripts/arm64_v8a_Android/build_debian.sh index db0cda386..05aa13a52 100644 --- a/.github/scripts/arm64_v8a_Android/build_debian.sh +++ b/.github/scripts/arm64_v8a_Android/build_debian.sh @@ -184,7 +184,7 @@ set +x #Chmod +xwr find "$BINDIR" -maxdepth 1 -type f -exec chmod +xwr {} \; 2>/dev/null #Strip - find "$BINDIR" -maxdepth 1 -type f -exec aarch64-linux-gnu-strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BINDIR" -maxdepth 1 -type f ! -name "*.AppImage" -exec aarch64-linux-gnu-strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #Rename anything with *_arm64_v8a* find "$BINDIR" -type f -name '*_Android' -exec sh -c 'newname=$(echo "$1" | sed "s/_arm64_v8a_Android//"); mv "$1" "$newname"' sh {} \; #-------------------------------------------------------# @@ -192,7 +192,7 @@ set +x #Chmod +xwr find "$BASEUTILSDIR" -maxdepth 1 -type f -exec chmod +xwr {} \; 2>/dev/null #Strip - find "$BASEUTILSDIR" -maxdepth 1 -type f -exec aarch64-linux-gnu-strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR" -maxdepth 1 -type f ! -name "*.AppImage" -exec aarch64-linux-gnu-strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #Rename anything with *_arm64_v8a* find "$BASEUTILSDIR" -type f -name '*_Android' -exec sh -c 'newname=$(echo "$1" | sed "s/_arm64_v8a_Android//"); mv "$1" "$newname"' sh {} \; #-------------------------------------------------------# @@ -233,7 +233,7 @@ set +x #Chmod +xwr find "$BINDIR" -maxdepth 1 -type f -exec chmod +xwr {} \; 2>/dev/null #Strip - find "$BINDIR" -maxdepth 1 -type f -exec aarch64-linux-gnu-strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BINDIR" -maxdepth 1 -type f ! -name "*.AppImage" -exec aarch64-linux-gnu-strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #Rename anything with *_arm64_v8a* find "$BINDIR" -type f -name '*_Android' -exec sh -c 'newname=$(echo "$1" | sed "s/_arm64_v8a_Android//"); mv "$1" "$newname"' sh {} \; #File @@ -257,7 +257,7 @@ set +x cd "$BASEUTILSDIR" rclone_base_dw() { - rclone copy "r2:/bin/arm64_v8a_Android/Baseutils/" "." --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.txt" --exclude="*.tmp" --exclude="*.upx" --exclude="*.yaml" --exclude="*.zip" --user-agent="$USER_AGENT" --buffer-size="10M" --s3-upload-concurrency="50" --s3-chunk-size="10M" --multi-thread-streams="50" --checkers="2000" --transfers="100" --retries="10" --check-first --checksum --copy-links --fast-list --progress + rclone copy "r2:/bin/arm64_v8a_Android/Baseutils/" "." --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.txt" --exclude="*.tmp" --exclude="*.upx" --exclude="*.yaml" --exclude="*.zip"--exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.txt" --exclude="*.tmp" --exclude="*.upx" --exclude="*.yaml" --exclude="*.zip" --user-agent="$USER_AGENT" --buffer-size="10M" --s3-upload-concurrency="50" --s3-chunk-size="10M" --multi-thread-streams="50" --checkers="2000" --transfers="100" --retries="10" --check-first --checksum --copy-links --fast-list --progress } export -f rclone_base_dw sleep 60 && rclone_base_dw ; sleep 60 && rclone_base_dw ; sleep 60 && rclone_base_dw diff --git a/.github/scripts/arm64_v8a_Android/init_debian.sh b/.github/scripts/arm64_v8a_Android/init_debian.sh index 02d6ba8b5..95995e5b8 100644 --- a/.github/scripts/arm64_v8a_Android/init_debian.sh +++ b/.github/scripts/arm64_v8a_Android/init_debian.sh @@ -132,12 +132,12 @@ sudo apt-get update -y 2>/dev/null sudo apt-get install apt-transport-https apt-utils ca-certificates coreutils gnupg2 moreutils software-properties-common util-linux -y 2>/dev/null ; sudo apt-get update -y 2>/dev/null #Install Build Des - sudo apt-get install aria2 automake bc binutils b3sum build-essential ca-certificates ccache diffutils dos2unix gawk lzip jq libtool libtool-bin make musl musl-dev musl-tools p7zip-full rsync texinfo wget -y 2>/dev/null + sudo apt-get install aria2 automake bc binutils b3sum build-essential ca-certificates ccache diffutils dos2unix gawk imagemagick lzip jq libtool libtool-bin make musl musl-dev musl-tools p7zip-full rsync texinfo wget -y 2>/dev/null sudo apt-get install -y --no-install-recommends autoconf automake autopoint binutils bison build-essential byacc ca-certificates clang flex file jq libtool libtool-bin patch patchelf pkg-config qemu-user-static scons wget 2>/dev/null sudo apt-get install devscripts -y --no-install-recommends 2>/dev/null sudo apt-get install cmake -y #Re - sudo apt-get install aria2 automake bc binutils b3sum build-essential ca-certificates ccache diffutils dos2unix gawk lzip jq libtool libtool-bin make musl musl-dev musl-tools p7zip-full rsync texinfo wget -y 2>/dev/null + sudo apt-get install aria2 automake bc binutils b3sum build-essential ca-certificates ccache diffutils dos2unix gawk imagemagick lzip jq libtool libtool-bin make musl musl-dev musl-tools p7zip-full rsync texinfo wget -y 2>/dev/null sudo apt-get install -y --no-install-recommends autoconf automake autopoint binutils bison build-essential byacc ca-certificates clang flex file jq libtool libtool-bin patch patchelf pkg-config qemu-user-static scons wget 2>/dev/null sudo apt-get install devscripts -y --no-install-recommends 2>/dev/null sudo apt-get install cmake -y diff --git a/.github/scripts/x86_64_Linux/bins/a-utils.sh b/.github/scripts/x86_64_Linux/bins/a-utils.sh index f2f18a5b6..205ea5fb7 100644 --- a/.github/scripts/x86_64_Linux/bins/a-utils.sh +++ b/.github/scripts/x86_64_Linux/bins/a-utils.sh @@ -36,7 +36,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then [ "$(find ./ -mindepth 1 -maxdepth 1)" ] && sudo rsync -av --copy-links "./." "$BASEUTILSDIR/a-utils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/a-utils/" && chmod -R 755 "$BASEUTILSDIR/a-utils/" #Strip - find "$BASEUTILSDIR/a-utils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/a-utils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/a-utils/"* @@ -59,7 +59,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/a-utils/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/a-utils/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/a-utils/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/bash.sh b/.github/scripts/x86_64_Linux/bins/bash.sh index 407a92ae2..1d611c62d 100644 --- a/.github/scripts/x86_64_Linux/bins/bash.sh +++ b/.github/scripts/x86_64_Linux/bins/bash.sh @@ -34,7 +34,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/bash" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/bash/" && chmod -R 755 "$BASEUTILSDIR/bash/" #Strip - find "$BASEUTILSDIR/bash" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/bash" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null cp "$BASEUTILSDIR/bash/bash" "$BINDIR/bash" #-------------------------------------------------------# ##Meta @@ -58,7 +58,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/bash/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/bash/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/bash/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/bintools.sh b/.github/scripts/x86_64_Linux/bins/bintools.sh index 120cc027e..5440dabb9 100644 --- a/.github/scripts/x86_64_Linux/bins/bintools.sh +++ b/.github/scripts/x86_64_Linux/bins/bintools.sh @@ -55,7 +55,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/bintools" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/bintools" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/bintools/" && chmod -R 755 "$BASEUTILSDIR/bintools/" #Strip - find "$BASEUTILSDIR/bintools" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/bintools" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -79,7 +79,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/bintools/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/bintools/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/bintools/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description @@ -125,7 +125,7 @@ unset PKG_CONFIG_PATH PKG_CONFIG_LIBDIR PKG_CONFIG_SYSROOT_DIR PKG_CONFIG_SYSTEM mkdir -p "$BASEUTILSDIR/bintools" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/bintools" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/bintools/" && chmod -R 755 "$BASEUTILSDIR/bintools/" #Strip - find "$BASEUTILSDIR/bintools" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/bintools" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -149,7 +149,7 @@ unset PKG_CONFIG_PATH PKG_CONFIG_LIBDIR PKG_CONFIG_SYSROOT_DIR PKG_CONFIG_SYSTEM EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/bintools/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/bintools/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/bintools/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/binutils.sh b/.github/scripts/x86_64_Linux/bins/binutils.sh index 7ad92032b..f2eb79f05 100644 --- a/.github/scripts/x86_64_Linux/bins/binutils.sh +++ b/.github/scripts/x86_64_Linux/bins/binutils.sh @@ -55,7 +55,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/binutils" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/binutils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/binutils/" && chmod -R 755 "$BASEUTILSDIR/binutils/" #Strip - find "$BASEUTILSDIR/binutils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/binutils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -79,7 +79,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/binutils/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/binutils/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/binutils/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description @@ -125,7 +125,7 @@ unset PKG_CONFIG_PATH PKG_CONFIG_LIBDIR PKG_CONFIG_SYSROOT_DIR PKG_CONFIG_SYSTEM mkdir -p "$BASEUTILSDIR/binutils" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/binutils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/binutils/" && chmod -R 755 "$BASEUTILSDIR/binutils/" #Strip - find "$BASEUTILSDIR/binutils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/binutils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -149,7 +149,7 @@ unset PKG_CONFIG_PATH PKG_CONFIG_LIBDIR PKG_CONFIG_SYSROOT_DIR PKG_CONFIG_SYSTEM EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/binutils/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/binutils/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/binutils/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/btrfs-progs.sh b/.github/scripts/x86_64_Linux/bins/btrfs-progs.sh index 1d394e530..9c672081f 100644 --- a/.github/scripts/x86_64_Linux/bins/btrfs-progs.sh +++ b/.github/scripts/x86_64_Linux/bins/btrfs-progs.sh @@ -36,7 +36,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/btrfs-progs" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/btrfs-progs" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/btrfs-progs/" && chmod -R 755 "$BASEUTILSDIR/btrfs-progs/" #Strip - find "$BASEUTILSDIR/btrfs-progs" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/btrfs-progs" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -60,7 +60,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/btrfs-progs/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/btrfs-progs/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/btrfs-progs/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/busybox.sh b/.github/scripts/x86_64_Linux/bins/busybox.sh index 42ecf7380..f68bf16c2 100644 --- a/.github/scripts/x86_64_Linux/bins/busybox.sh +++ b/.github/scripts/x86_64_Linux/bins/busybox.sh @@ -34,7 +34,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then #sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/busybox" #sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/busybox/" && chmod -R 755 "$BASEUTILSDIR/busybox/" ##Strip - #find "$BASEUTILSDIR/busybox" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + #find "$BASEUTILSDIR/busybox" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 ##Build (MUSL) pushd "$($TMPDIRS)" >/dev/null 2>&1 @@ -67,7 +67,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then [ "$(find ./ -mindepth 1 -maxdepth 1)" ] && sudo rsync -av --copy-links "./." "$BASEUTILSDIR/busybox" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/busybox/" && chmod -R 755 "$BASEUTILSDIR/busybox/" #Strip - find "$BASEUTILSDIR/busybox" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/busybox" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/busybox/"* @@ -90,7 +90,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/busybox/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/busybox/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/busybox/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/coreutils-vlang.sh b/.github/scripts/x86_64_Linux/bins/coreutils-vlang.sh index 7ab23b9c5..693467516 100644 --- a/.github/scripts/x86_64_Linux/bins/coreutils-vlang.sh +++ b/.github/scripts/x86_64_Linux/bins/coreutils-vlang.sh @@ -162,7 +162,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then [ "$(find ./ -mindepth 1 -maxdepth 1)" ] && sudo rsync -av --copy-links "./." "$BASEUTILSDIR/coreutils-vlang" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/coreutils-vlang/" && chmod -R 755 "$BASEUTILSDIR/coreutils-vlang/" #Strip - find "$BASEUTILSDIR/coreutils-vlang" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/coreutils-vlang" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/coreutils-vlang/"* @@ -185,7 +185,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/coreutils-vlang/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/coreutils-vlang/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/coreutils-vlang/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/coreutils.sh b/.github/scripts/x86_64_Linux/bins/coreutils.sh index 662ec6530..ec76e6639 100644 --- a/.github/scripts/x86_64_Linux/bins/coreutils.sh +++ b/.github/scripts/x86_64_Linux/bins/coreutils.sh @@ -34,7 +34,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/coreutils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/coreutils/" && chmod -R 755 "$BASEUTILSDIR/coreutils/" #Strip - find "$BASEUTILSDIR/coreutils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/coreutils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 ##Build (MUSL) pushd "$($TMPDIRS)" >/dev/null 2>&1 @@ -79,7 +79,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then [ "$(find ./ -mindepth 1 -maxdepth 1)" ] && sudo rsync -av --copy-links "./." "$BASEUTILSDIR/coreutils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/coreutils/" && chmod -R 755 "$BASEUTILSDIR/coreutils/" #Strip - find "$BASEUTILSDIR/coreutils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/coreutils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/coreutils/"* @@ -102,7 +102,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/coreutils/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/coreutils/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/coreutils/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/cryptsetup.sh b/.github/scripts/x86_64_Linux/bins/cryptsetup.sh index d38c57966..15354b185 100644 --- a/.github/scripts/x86_64_Linux/bins/cryptsetup.sh +++ b/.github/scripts/x86_64_Linux/bins/cryptsetup.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/cryptsetup" ; sudo rsync -av --copy-links "./result-bin/bin/." "$BASEUTILSDIR/cryptsetup" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/cryptsetup/" && chmod -R 755 "$BASEUTILSDIR/cryptsetup/" #Strip - find "$BASEUTILSDIR/cryptsetup" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/cryptsetup" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -56,7 +56,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/cryptsetup/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/cryptsetup/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/cryptsetup/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/dateutils.sh b/.github/scripts/x86_64_Linux/bins/dateutils.sh index 04654ac66..fa7fa2636 100644 --- a/.github/scripts/x86_64_Linux/bins/dateutils.sh +++ b/.github/scripts/x86_64_Linux/bins/dateutils.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/dateutils" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/dateutils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/dateutils/" && chmod -R 755 "$BASEUTILSDIR/dateutils/" #Strip - find "$BASEUTILSDIR/dateutils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/dateutils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -56,7 +56,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/dateutils/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/dateutils/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/dateutils/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/dbus.sh b/.github/scripts/x86_64_Linux/bins/dbus.sh index 16cf908c7..2a742b3d2 100644 --- a/.github/scripts/x86_64_Linux/bins/dbus.sh +++ b/.github/scripts/x86_64_Linux/bins/dbus.sh @@ -33,7 +33,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/libexec/." "$BASEUTILSDIR/dbus" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/dbus/" && chmod -R 755 "$BASEUTILSDIR/dbus/" #Strip - find "$BASEUTILSDIR/dbus" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/dbus" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -57,7 +57,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/dbus/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/dbus/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/dbus/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/desktop-file-utils.sh b/.github/scripts/x86_64_Linux/bins/desktop-file-utils.sh index bb904ba70..9144fa228 100644 --- a/.github/scripts/x86_64_Linux/bins/desktop-file-utils.sh +++ b/.github/scripts/x86_64_Linux/bins/desktop-file-utils.sh @@ -31,7 +31,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/bin/." "$BINDIR/" sudo chown -R "$(whoami):$(whoami)" "$BINDIR/" && chmod -R 755 "$BINDIR/" #Strip - find "$BINDIR" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BINDIR" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 fi #-------------------------------------------------------# diff --git a/.github/scripts/x86_64_Linux/bins/dropbear.sh b/.github/scripts/x86_64_Linux/bins/dropbear.sh index 5536455a3..bf37f50df 100644 --- a/.github/scripts/x86_64_Linux/bins/dropbear.sh +++ b/.github/scripts/x86_64_Linux/bins/dropbear.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then # mkdir -p "$BASEUTILSDIR/dropbear" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/dropbear" # sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/dropbear/" && chmod -R 755 "$BASEUTILSDIR/dropbear/" # #Strip - # find "$BASEUTILSDIR/dropbear" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + # find "$BASEUTILSDIR/dropbear" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null # nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 ##Build (alpine-musl) pushd "$($TMPDIRS)" >/dev/null 2>&1 @@ -60,7 +60,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then [ "$(find ./ -mindepth 1 -maxdepth 1)" ] && sudo rsync -av --copy-links "./." "$BASEUTILSDIR/dropbear" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/dropbear/" && chmod -R 755 "$BASEUTILSDIR/dropbear/" #Strip - find "$BASEUTILSDIR/dropbear" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/dropbear" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/dropbear/"* @@ -83,7 +83,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/dropbear/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/dropbear/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/dropbear/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/e2fsprogs.sh b/.github/scripts/x86_64_Linux/bins/e2fsprogs.sh index 43a7037a9..154b9cbf6 100644 --- a/.github/scripts/x86_64_Linux/bins/e2fsprogs.sh +++ b/.github/scripts/x86_64_Linux/bins/e2fsprogs.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/e2fsprogs" ; sudo rsync -av --copy-links "./result-bin/bin/." "$BASEUTILSDIR/e2fsprogs" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/e2fsprogs/" && chmod -R 755 "$BASEUTILSDIR/e2fsprogs/" #Strip - find "$BASEUTILSDIR/e2fsprogs" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/e2fsprogs" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -56,7 +56,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/e2fsprogs/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/e2fsprogs/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/e2fsprogs/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/exfat.sh b/.github/scripts/x86_64_Linux/bins/exfat.sh index aadbbb71a..422f7469d 100644 --- a/.github/scripts/x86_64_Linux/bins/exfat.sh +++ b/.github/scripts/x86_64_Linux/bins/exfat.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/exfat" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/exfat" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/exfat/" && chmod -R 755 "$BASEUTILSDIR/exfat/" #Strip - find "$BASEUTILSDIR/exfat" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/exfat" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -56,7 +56,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/exfat/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/exfat/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/exfat/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/exfatprogs.sh b/.github/scripts/x86_64_Linux/bins/exfatprogs.sh index e1df9097c..c5be9469c 100644 --- a/.github/scripts/x86_64_Linux/bins/exfatprogs.sh +++ b/.github/scripts/x86_64_Linux/bins/exfatprogs.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/exfatprogs" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/exfatprogs" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/exfatprogs/" && chmod -R 755 "$BASEUTILSDIR/exfatprogs/" #Strip - find "$BASEUTILSDIR/exfatprogs" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/exfatprogs" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -56,7 +56,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/exfatprogs/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/exfatprogs/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/exfatprogs/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/findutils.sh b/.github/scripts/x86_64_Linux/bins/findutils.sh index 479a29105..e639139b3 100644 --- a/.github/scripts/x86_64_Linux/bins/findutils.sh +++ b/.github/scripts/x86_64_Linux/bins/findutils.sh @@ -35,7 +35,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/libexec/." "$BASEUTILSDIR/findutils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/findutils/" && chmod -R 755 "$BASEUTILSDIR/findutils/" #Strip - find "$BASEUTILSDIR/findutils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/findutils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/findutils/"* @@ -58,7 +58,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/findutils/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/findutils/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/findutils/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/fio.sh b/.github/scripts/x86_64_Linux/bins/fio.sh index 53feb53f2..27997dfca 100644 --- a/.github/scripts/x86_64_Linux/bins/fio.sh +++ b/.github/scripts/x86_64_Linux/bins/fio.sh @@ -66,7 +66,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then [ "$(find ./ -mindepth 1 -maxdepth 1)" ] && sudo rsync -av --copy-links "./." "$BASEUTILSDIR/fio" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/fio/" && chmod -R 755 "$BASEUTILSDIR/fio/" #Strip - find "$BASEUTILSDIR/fio" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/fio" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/fio/"* @@ -89,7 +89,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/fio/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/fio/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/fio/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/fuse3.sh b/.github/scripts/x86_64_Linux/bins/fuse3.sh index 4fa8f37a6..dfd30d249 100644 --- a/.github/scripts/x86_64_Linux/bins/fuse3.sh +++ b/.github/scripts/x86_64_Linux/bins/fuse3.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/fuse3" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/fuse3" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/fuse3/" && chmod -R 755 "$BASEUTILSDIR/fuse3/" #Strip - find "$BASEUTILSDIR/fuse3" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/fuse3" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -56,7 +56,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/fuse3/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/fuse3/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/fuse3/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/gawk.sh b/.github/scripts/x86_64_Linux/bins/gawk.sh index 50e8059af..df5d84ff2 100644 --- a/.github/scripts/x86_64_Linux/bins/gawk.sh +++ b/.github/scripts/x86_64_Linux/bins/gawk.sh @@ -35,7 +35,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/libexec/awk/." "$BASEUTILSDIR/gawk" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/gawk/" && chmod -R 755 "$BASEUTILSDIR/gawk/" #Strip - find "$BASEUTILSDIR/gawk" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/gawk" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/gawk/"* @@ -58,7 +58,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/gawk/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/gawk/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/gawk/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/gdb.sh b/.github/scripts/x86_64_Linux/bins/gdb.sh index 9492d8b90..610faaa94 100644 --- a/.github/scripts/x86_64_Linux/bins/gdb.sh +++ b/.github/scripts/x86_64_Linux/bins/gdb.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/gdb" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/gdb" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/gdb/" && chmod -R 755 "$BASEUTILSDIR/gdb/" #Strip - find "$BASEUTILSDIR/gdb" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/gdb" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -56,7 +56,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/gdb/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/gdb/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/gdb/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/git.sh b/.github/scripts/x86_64_Linux/bins/git.sh index 0e87401e1..97d5ff069 100644 --- a/.github/scripts/x86_64_Linux/bins/git.sh +++ b/.github/scripts/x86_64_Linux/bins/git.sh @@ -35,7 +35,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then rsync -av --copy-links --exclude="*/" "./bin/." "$BASEUTILSDIR/git" rsync -av --copy-links --exclude="*/" "./libexec/git-core/." "$BASEUTILSDIR/git" rsync -av --copy-links "./share/git-core/." "$BASEUTILSDIR/git" - find "$BASEUTILSDIR/git" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/git" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -59,7 +59,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/git/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/git/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/git/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/grep.sh b/.github/scripts/x86_64_Linux/bins/grep.sh index 9bda828ae..b30c2c9f9 100644 --- a/.github/scripts/x86_64_Linux/bins/grep.sh +++ b/.github/scripts/x86_64_Linux/bins/grep.sh @@ -60,7 +60,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then [ "$(find ./ -mindepth 1 -maxdepth 1)" ] && sudo rsync -av --copy-links "./." "$BASEUTILSDIR/grep" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/grep/" && chmod -R 755 "$BASEUTILSDIR/grep/" #Strip - find "$BASEUTILSDIR/grep" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/grep" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/grep/"* @@ -84,7 +84,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/grep/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/grep/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/grep/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/gzip.sh b/.github/scripts/x86_64_Linux/bins/gzip.sh index a778b7703..9e2382328 100644 --- a/.github/scripts/x86_64_Linux/bins/gzip.sh +++ b/.github/scripts/x86_64_Linux/bins/gzip.sh @@ -34,7 +34,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/gzip" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/gzip/" && chmod -R 755 "$BASEUTILSDIR/gzip/" #Strip - find "$BASEUTILSDIR/gzip" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/gzip" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/gzip/"* @@ -57,7 +57,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/gzip/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/gzip/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/gzip/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/hashcat-utils.sh b/.github/scripts/x86_64_Linux/bins/hashcat-utils.sh index bbd770826..906c42a14 100644 --- a/.github/scripts/x86_64_Linux/bins/hashcat-utils.sh +++ b/.github/scripts/x86_64_Linux/bins/hashcat-utils.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/hashcat-utils" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/hashcat-utils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/hashcat-utils/" && chmod -R 755 "$BASEUTILSDIR/hashcat-utils/" #Strip - find "$BASEUTILSDIR/hashcat-utils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/hashcat-utils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null find "$BASEUTILSDIR/hashcat-utils" -type f -executable -name "*.bin" -exec sh -c 'mv "$1" "${1%.bin}"' _ {} \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# @@ -57,7 +57,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/hashcat-utils/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/hashcat-utils/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/hashcat-utils/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/html-xml-utils.sh b/.github/scripts/x86_64_Linux/bins/html-xml-utils.sh index 856ac45c8..2ecfa09b1 100644 --- a/.github/scripts/x86_64_Linux/bins/html-xml-utils.sh +++ b/.github/scripts/x86_64_Linux/bins/html-xml-utils.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/html-xml-utils" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/html-xml-utils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/html-xml-utils/" && chmod -R 755 "$BASEUTILSDIR/html-xml-utils/" #Strip - find "$BASEUTILSDIR/html-xml-utils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/html-xml-utils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -56,7 +56,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/html-xml-utils/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/html-xml-utils/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/html-xml-utils/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/iproute2.sh b/.github/scripts/x86_64_Linux/bins/iproute2.sh index 3ff47bc3f..4682e6055 100644 --- a/.github/scripts/x86_64_Linux/bins/iproute2.sh +++ b/.github/scripts/x86_64_Linux/bins/iproute2.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/iproute2" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/iproute2" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/iproute2/" && chmod -R 755 "$BASEUTILSDIR/iproute2/" #Strip - find "$BASEUTILSDIR/iproute2" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/iproute2" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -56,7 +56,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/iproute2/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/iproute2/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/iproute2/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/iputils.sh b/.github/scripts/x86_64_Linux/bins/iputils.sh index c52230b85..93df22bcd 100644 --- a/.github/scripts/x86_64_Linux/bins/iputils.sh +++ b/.github/scripts/x86_64_Linux/bins/iputils.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/iputils" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/iputils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/iputils/" && chmod -R 755 "$BASEUTILSDIR/iputils/" #Strip - find "$BASEUTILSDIR/iputils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/iputils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -56,7 +56,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/iputils/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/iputils/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/iputils/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/kmod.sh b/.github/scripts/x86_64_Linux/bins/kmod.sh index f4ab92df4..2df4a3664 100644 --- a/.github/scripts/x86_64_Linux/bins/kmod.sh +++ b/.github/scripts/x86_64_Linux/bins/kmod.sh @@ -34,7 +34,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/kmod" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/kmod/" && chmod -R 755 "$BASEUTILSDIR/kmod/" #Strip - find "$BASEUTILSDIR/kmod" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/kmod" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/kmod/"* @@ -57,7 +57,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/kmod/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/kmod/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/kmod/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/libarchive.sh b/.github/scripts/x86_64_Linux/bins/libarchive.sh index 347956403..c6dfaa15e 100644 --- a/.github/scripts/x86_64_Linux/bins/libarchive.sh +++ b/.github/scripts/x86_64_Linux/bins/libarchive.sh @@ -34,7 +34,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/libarchive" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/libarchive/" && chmod -R 755 "$BASEUTILSDIR/libarchive/" #Strip - find "$BASEUTILSDIR/libarchive" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/libarchive" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -58,7 +58,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/libarchive/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/libarchive/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/libarchive/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" rm -rf "./to_human_bytes.jq" 2>/dev/null for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do diff --git a/.github/scripts/x86_64_Linux/bins/lklfuse.sh b/.github/scripts/x86_64_Linux/bins/lklfuse.sh index 5848762aa..e5cffabea 100644 --- a/.github/scripts/x86_64_Linux/bins/lklfuse.sh +++ b/.github/scripts/x86_64_Linux/bins/lklfuse.sh @@ -35,7 +35,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then #mkdir -p "$BASEUTILSDIR/lkl" ; sudo rsync -av --copy-links "./result-bin/bin/." "$BASEUTILSDIR/lkl" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/lkl/" && chmod -R 755 "$BASEUTILSDIR/lkl/" #Strip - find "$BASEUTILSDIR/lkl" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/lkl" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -59,7 +59,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/lkl/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/lkl/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/lkl/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/mpv.sh b/.github/scripts/x86_64_Linux/bins/mpv.sh new file mode 100644 index 000000000..c574545dc --- /dev/null +++ b/.github/scripts/x86_64_Linux/bins/mpv.sh @@ -0,0 +1,91 @@ +#!/usr/bin/env bash + +#-------------------------------------------------------# +#Sanity Checks +if [ "$BUILD" != "YES" ] || \ + [ -z "$BINDIR" ] || \ + [ -z "$EGET_EXCLUDE" ] || \ + [ -z "$EGET_TIMEOUT" ] || \ + [ -z "$GIT_TERMINAL_PROMPT" ] || \ + [ -z "$GIT_ASKPASS" ] || \ + [ -z "$GITHUB_TOKEN" ] || \ + [ -z "$SYSTMP" ] || \ + [ -z "$TMPDIRS" ]; then + #exit + echo -e "\n[+]Skipping Builds...\n" + exit 1 +fi +#-------------------------------------------------------# + +#-------------------------------------------------------# +##Main +export SKIP_BUILD="NO" #YES, in case of deleted repos, broken builds etc +if [ "$SKIP_BUILD" == "NO" ]; then + #mpv : 🎥 Command line video player + export BIN="mpv" + export SOURCE_URL="https://github.com/mpv-player/mpv" + echo -e "\n\n [+] (Building | Fetching) $BIN :: $SOURCE_URL\n" + ##Build + pushd "$($TMPDIRS)" >/dev/null 2>&1 + nix bundle --bundler "github:ralismark/nix-appimage" "nixpkgs#mpv" --log-format bar-with-logs + ##Copy + sudo rsync -av --copy-links "./mpv.AppImage" "./mpv.AppImage.tmp" + sudo chown -R "$(whoami):$(whoami)" "./mpv.AppImage.tmp" && chmod -R 755 "./mpv.AppImage.tmp" + du -sh "./mpv.AppImage.tmp" && file "./mpv.AppImage.tmp" + ##Extract + APPIMAGE="$(realpath .)/mpv.AppImage.tmp" && export APPIMAGE="${APPIMAGE}" + OFFSET="$(${APPIMAGE} --appimage-offset)" && export OFFSET="${OFFSET}" + tail -c +"$(($OFFSET + 1))" "${APPIMAGE}" > "./squash.tmp" + #unsquashfs -force -dest "./squash_tmp/" "./squash.tmp" + "${APPIMAGE}" --appimage-extract >/dev/null && rm -f "${APPIMAGE}" + OWD="$(realpath .)" && export OWD="${OWD}" + APPIMAGE_EXTRACT="$(realpath "./squashfs-root")" && export APPIMAGE_EXTRACT="${APPIMAGE_EXTRACT}" + ##Patch + if [ -d "${APPIMAGE_EXTRACT}" ] && [ "$(find "${APPIMAGE_EXTRACT}" -mindepth 1 -print -quit 2>/dev/null)" ]; then + #Media + cd "${APPIMAGE_EXTRACT}" + mkdir -p "./usr/share/applications" && mkdir -p "./usr/share/metainfo" + SHARE_DIR="$(find "." -path '*share/metainfo*.xml' | awk '{ print length, $0 }' | sort -n | cut -d" " -f2- | head -n 1 | awk -F'/share/' '{print $1}')/share" && export SHARE_DIR="${SHARE_DIR}" + #usr/{applications,bash-completion,icons,metainfo,mpv,zsh} + rsync -av --copy-links --exclude="bin" "${SHARE_DIR}/" "./usr/share/" && ls "./usr/share/" + ##Appdata/AppStream + # find "." -path '*share/metainfo*.xml' | awk '{ print length, $0 }' | sort -n | cut -d" " -f2- | head -n 1 | xargs -I {} sh -c 'cp {} "./usr/share/metainfo/"' ; cp "./usr/share/metainfo/mpv.metainfo.xml" "./usr/share/metainfo/mpv.appdata.xml" + #Icon + find "." -path '*128x128/apps/*.png' | awk '{ print length, $0 }' | sort -n | cut -d" " -f2- | head -n 1 | xargs -I {} sh -c 'cp "{}" ./mpv.png' + find "." -maxdepth 1 -type f -name '*.svg' -exec sh -c 'convert "$0" "${0%.svg}.png"' {} \; 2>/dev/null + cp "./mpv.png" "./.DirIcon" + ##Desktop + find "." -path '*mpv*.desktop' | awk '{ print length, $0 }' | sort -n | cut -d" " -f2- | head -n 1 | xargs -I {} sh -c 'cp {} "./mpv.desktop"' + sed 's/Icon=[^ ]*/Icon=mpv/' -i "./mpv.desktop" 2>/dev/null + #(Re)Pack + cd "${OWD}" + curl -qfsSL "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-$(uname -m).AppImage" -o "./appimagetool" && chmod +x "./appimagetool" + "./appimagetool" --comp "zstd" \ + --mksquashfs-opt -root-owned \ + --mksquashfs-opt -no-xattrs \ + --mksquashfs-opt -noappend \ + --mksquashfs-opt -b --mksquashfs-opt "1M" \ + --mksquashfs-opt -mkfs-time --mksquashfs-opt "0" \ + --mksquashfs-opt -Xcompression-level --mksquashfs-opt "22" \ + "${APPIMAGE_EXTRACT}" "$BINDIR/mpv.AppImage" + #Meta + du -sh "$BINDIR/mpv.AppImage" && file "$BINDIR/mpv.AppImage" + #clean + unset APPIMAGE APPIMAGE_EXTRACT OFFSET OWD SHARE_DIR + fi + #End + nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 + popd >/dev/null 2>&1 +fi +#-------------------------------------------------------# + +#-------------------------------------------------------# +##Cleanup +unset SKIP_BUILD ; export BUILT="YES" +#In case of zig polluted env +unset AR CC CFLAGS CXX CPPFLAGS CXXFLAGS DLLTOOL HOST_CC HOST_CXX LDFLAGS LIBS OBJCOPY RANLIB +#In case of go polluted env +unset GOARCH GOOS CGO_ENABLED CGO_CFLAGS +#PKG Config +unset PKG_CONFIG_PATH PKG_CONFIG_LIBDIR PKG_CONFIG_SYSROOT_DIR PKG_CONFIG_SYSTEM_INCLUDE_PATH PKG_CONFIG_SYSTEM_LIBRARY_PATH +#-------------------------------------------------------# \ No newline at end of file diff --git a/.github/scripts/x86_64_Linux/bins/mpv.yaml b/.github/scripts/x86_64_Linux/bins/mpv.yaml new file mode 100644 index 000000000..7b775e4ec --- /dev/null +++ b/.github/scripts/x86_64_Linux/bins/mpv.yaml @@ -0,0 +1,7 @@ +name: "mpv" +description: "🎥 Command line video player (AppImage)" +web_url: "https://mpv.io" +repo_url: "https://github.com/mpv-player/mpv" +path: "/" +bins: + - "mpv.AppImage" \ No newline at end of file diff --git a/.github/scripts/x86_64_Linux/bins/mtdutils.sh b/.github/scripts/x86_64_Linux/bins/mtdutils.sh index a34b9e0be..487c2fc9b 100644 --- a/.github/scripts/x86_64_Linux/bins/mtdutils.sh +++ b/.github/scripts/x86_64_Linux/bins/mtdutils.sh @@ -33,7 +33,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/libexec/mtd-utils/." "$BASEUTILSDIR/mtdutils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/mtdutils/" && chmod -R 755 "$BASEUTILSDIR/mtdutils/" #Strip - find "$BASEUTILSDIR/mtdutils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/mtdutils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -57,7 +57,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/mtdutils/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/mtdutils/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/mtdutils/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/netcat-gnu.sh b/.github/scripts/x86_64_Linux/bins/netcat-gnu.sh index b04f3a9e7..602c6571b 100644 --- a/.github/scripts/x86_64_Linux/bins/netcat-gnu.sh +++ b/.github/scripts/x86_64_Linux/bins/netcat-gnu.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/netcat-gnu" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/netcat-gnu" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/netcat-gnu/" && chmod -R 755 "$BASEUTILSDIR/netcat-gnu/" #Strip - find "$BASEUTILSDIR/netcat-gnu" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/netcat-gnu" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -56,7 +56,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/netcat-gnu/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/netcat-gnu/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/netcat-gnu/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/netcat.sh b/.github/scripts/x86_64_Linux/bins/netcat.sh index 0eae1ef09..2f21efe49 100644 --- a/.github/scripts/x86_64_Linux/bins/netcat.sh +++ b/.github/scripts/x86_64_Linux/bins/netcat.sh @@ -34,7 +34,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then cp "$BASEUTILSDIR/netcat/nc" "$BASEUTILSDIR/netcat/netcat" cp "$BASEUTILSDIR/netcat/netcat" "$BINDIR/netcat" #Strip - find "$BASEUTILSDIR/netcat" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/netcat" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -58,7 +58,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/netcat/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/netcat/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/netcat/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/nettools.sh b/.github/scripts/x86_64_Linux/bins/nettools.sh index 3b1433048..a290ad82d 100644 --- a/.github/scripts/x86_64_Linux/bins/nettools.sh +++ b/.github/scripts/x86_64_Linux/bins/nettools.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/nettools" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/nettools" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/nettools/" && chmod -R 755 "$BASEUTILSDIR/nettools/" #Strip - find "$BASEUTILSDIR/nettools" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/nettools" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -56,7 +56,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/nettools/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/nettools/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/nettools/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/nfs-utils.sh b/.github/scripts/x86_64_Linux/bins/nfs-utils.sh index a1743bd7d..4fcc8ddb5 100644 --- a/.github/scripts/x86_64_Linux/bins/nfs-utils.sh +++ b/.github/scripts/x86_64_Linux/bins/nfs-utils.sh @@ -33,7 +33,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/nfs-utils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/nfs-utils/" && chmod -R 755 "$BASEUTILSDIR/nfs-utils/" #Strip - find "$BASEUTILSDIR/nfs-utils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/nfs-utils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -57,7 +57,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/nfs-utils/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/nfs-utils/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/nfs-utils/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/nicotine-plus.sh b/.github/scripts/x86_64_Linux/bins/nicotine-plus.sh new file mode 100644 index 000000000..0a574e586 --- /dev/null +++ b/.github/scripts/x86_64_Linux/bins/nicotine-plus.sh @@ -0,0 +1,89 @@ +#!/usr/bin/env bash + +#-------------------------------------------------------# +#Sanity Checks +if [ "$BUILD" != "YES" ] || \ + [ -z "$BINDIR" ] || \ + [ -z "$EGET_EXCLUDE" ] || \ + [ -z "$EGET_TIMEOUT" ] || \ + [ -z "$GIT_TERMINAL_PROMPT" ] || \ + [ -z "$GIT_ASKPASS" ] || \ + [ -z "$GITHUB_TOKEN" ] || \ + [ -z "$SYSTMP" ] || \ + [ -z "$TMPDIRS" ]; then + #exit + echo -e "\n[+]Skipping Builds...\n" + exit 1 +fi +#-------------------------------------------------------# + +#-------------------------------------------------------# +##Main +export SKIP_BUILD="NO" #YES, in case of deleted repos, broken builds etc +if [ "$SKIP_BUILD" == "NO" ]; then + #nicotine-plus : Graphical client for the Soulseek peer-to-peer network + export BIN="nicotine-plus" + export SOURCE_URL="https://github.com/nicotine-plus/nicotine-plus" + echo -e "\n\n [+] (Building | Fetching) $BIN :: $SOURCE_URL\n" + ##Build + pushd "$($TMPDIRS)" >/dev/null 2>&1 + nix bundle --bundler "github:ralismark/nix-appimage" "nixpkgs#nicotine-plus" --log-format bar-with-logs + ##Copy + sudo rsync -av --copy-links "./nicotine-plus.AppImage" "./nicotine-plus.AppImage.tmp" + sudo chown -R "$(whoami):$(whoami)" "./nicotine-plus.AppImage.tmp" && chmod -R 755 "./nicotine-plus.AppImage.tmp" + du -sh "./nicotine-plus.AppImage.tmp" && file "./nicotine-plus.AppImage.tmp" + ##Extract + APPIMAGE="$(realpath .)/nicotine-plus.AppImage.tmp" && export APPIMAGE="${APPIMAGE}" + OFFSET="$(${APPIMAGE} --appimage-offset)" && export OFFSET="${OFFSET}" + tail -c +"$(($OFFSET + 1))" "${APPIMAGE}" > "./squash.tmp" + #unsquashfs -force -dest "./squash_tmp/" "./squash.tmp" + "${APPIMAGE}" --appimage-extract >/dev/null && rm -f "${APPIMAGE}" + OWD="$(realpath .)" && export OWD="${OWD}" + APPIMAGE_EXTRACT="$(realpath "./squashfs-root")" && export APPIMAGE_EXTRACT="${APPIMAGE_EXTRACT}" + ##Patch + if [ -d "${APPIMAGE_EXTRACT}" ] && [ "$(find "${APPIMAGE_EXTRACT}" -mindepth 1 -print -quit 2>/dev/null)" ]; then + #Media + cd "${APPIMAGE_EXTRACT}" + mkdir -p "./usr/share/applications" && mkdir -p "./usr/share/metainfo" + SHARE_DIR="$(find "." -path '*share/metainfo*.xml' | awk '{ print length, $0 }' | sort -n | cut -d" " -f2- | head -n 1 | awk -F'/share/' '{print $1}')/share" && export SHARE_DIR="${SHARE_DIR}" + #usr/{applications,bash-completion,icons,metainfo,nicotine-plus,zsh} + rsync -av --copy-links --exclude="bin" "${SHARE_DIR}/" "./usr/share/" && ls "./usr/share/" + #Icon + curl -qfsSL "https://raw.githubusercontent.com/nicotine-plus/nicotine-plus/master/data/icons/icon.svg" -o "./nicotine-plus.svg" + find "." -maxdepth 1 -type f -name '*.svg' -exec sh -c 'convert "$0" "${0%.svg}.png"' {} \; 2>/dev/null + cp "./nicotine-plus.png" "./.DirIcon" + ##Desktop + find "." -path '*nicotine*.desktop' | awk '{ print length, $0 }' | sort -n | cut -d" " -f2- | head -n 1 | xargs -I {} sh -c 'cp {} "./nicotine-plus.desktop"' + sed 's/Icon=[^ ]*/Icon=nicotine-plus/' -i "./nicotine-plus.desktop" 2>/dev/null + #(Re)Pack + cd "${OWD}" + curl -qfsSL "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-$(uname -m).AppImage" -o "./appimagetool" && chmod +x "./appimagetool" + "./appimagetool" --comp "zstd" \ + --mksquashfs-opt -root-owned \ + --mksquashfs-opt -no-xattrs \ + --mksquashfs-opt -noappend \ + --mksquashfs-opt -b --mksquashfs-opt "1M" \ + --mksquashfs-opt -mkfs-time --mksquashfs-opt "0" \ + --mksquashfs-opt -Xcompression-level --mksquashfs-opt "22" \ + "${APPIMAGE_EXTRACT}" "$BINDIR/nicotine-plus.AppImage" + #Meta + du -sh "$BINDIR/nicotine-plus.AppImage" && file "$BINDIR/nicotine-plus.AppImage" + #clean + unset APPIMAGE APPIMAGE_EXTRACT OFFSET OWD SHARE_DIR + fi + #End + nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 + popd >/dev/null 2>&1 +fi +#-------------------------------------------------------# + +#-------------------------------------------------------# +##Cleanup +unset SKIP_BUILD ; export BUILT="YES" +#In case of zig polluted env +unset AR CC CFLAGS CXX CPPFLAGS CXXFLAGS DLLTOOL HOST_CC HOST_CXX LDFLAGS LIBS OBJCOPY RANLIB +#In case of go polluted env +unset GOARCH GOOS CGO_ENABLED CGO_CFLAGS +#PKG Config +unset PKG_CONFIG_PATH PKG_CONFIG_LIBDIR PKG_CONFIG_SYSROOT_DIR PKG_CONFIG_SYSTEM_INCLUDE_PATH PKG_CONFIG_SYSTEM_LIBRARY_PATH +#-------------------------------------------------------# \ No newline at end of file diff --git a/.github/scripts/x86_64_Linux/bins/nicotine-plus.yaml b/.github/scripts/x86_64_Linux/bins/nicotine-plus.yaml new file mode 100644 index 000000000..cf95ea3dd --- /dev/null +++ b/.github/scripts/x86_64_Linux/bins/nicotine-plus.yaml @@ -0,0 +1,7 @@ +name: "nicotine-plus" +description: "Graphical client for the Soulseek peer-to-peer network (AppImage)" +web_url: "https://nicotine-plus.io" +repo_url: "https://github.com/nicotine-plus/nicotine-plus" +path: "/" +bins: + - "nicotine-plus.AppImage" \ No newline at end of file diff --git a/.github/scripts/x86_64_Linux/bins/openssh.sh b/.github/scripts/x86_64_Linux/bins/openssh.sh index 9b373e66d..70b8c5925 100644 --- a/.github/scripts/x86_64_Linux/bins/openssh.sh +++ b/.github/scripts/x86_64_Linux/bins/openssh.sh @@ -37,7 +37,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then rm -rf "./bin/"*.tgz && find "./bin" -empty -delete #strip cd "$(find "./bin" -maxdepth 1 -type d -name '*openssh*')" - find "." -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "." -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #Copy mkdir -p "$BASEUTILSDIR/openssh" rsync -av --copy-links "./bin/." "$BASEUTILSDIR/openssh" @@ -66,7 +66,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/openssh/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/openssh/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/openssh/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/openssl.sh b/.github/scripts/x86_64_Linux/bins/openssl.sh index fbebacecf..c6ec538b9 100644 --- a/.github/scripts/x86_64_Linux/bins/openssl.sh +++ b/.github/scripts/x86_64_Linux/bins/openssl.sh @@ -34,7 +34,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result-bin/bin/." "$BASEUTILSDIR/openssl" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/openssl/" && chmod -R 755 "$BASEUTILSDIR/openssl/" #Strip - find "$BASEUTILSDIR/openssl" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/openssl" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/openssl/"* @@ -57,7 +57,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/openssl/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/openssl/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/openssl/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/outils.sh b/.github/scripts/x86_64_Linux/bins/outils.sh index 3f8a11178..46313722a 100644 --- a/.github/scripts/x86_64_Linux/bins/outils.sh +++ b/.github/scripts/x86_64_Linux/bins/outils.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/outils" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/outils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/outils/" && chmod -R 755 "$BASEUTILSDIR/outils/" #Strip - find "$BASEUTILSDIR/outils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/outils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -56,7 +56,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/outils/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/outils/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/outils/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/pax-utils.sh b/.github/scripts/x86_64_Linux/bins/pax-utils.sh index 27c69f32b..90ef41a72 100644 --- a/.github/scripts/x86_64_Linux/bins/pax-utils.sh +++ b/.github/scripts/x86_64_Linux/bins/pax-utils.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/pax-utils" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/pax-utils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/pax-utils/" && chmod -R 755 "$BASEUTILSDIR/pax-utils/" #Strip - find "$BASEUTILSDIR/pax-utils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/pax-utils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -56,7 +56,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/pax-utils/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/pax-utils/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/pax-utils/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/procps.sh b/.github/scripts/x86_64_Linux/bins/procps.sh index b0bbefac4..69ee1b850 100644 --- a/.github/scripts/x86_64_Linux/bins/procps.sh +++ b/.github/scripts/x86_64_Linux/bins/procps.sh @@ -34,7 +34,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/procps" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/procps/" && chmod -R 755 "$BASEUTILSDIR/procps/" #Strip - find "$BASEUTILSDIR/procps" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/procps" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/procps/"* @@ -57,7 +57,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/procps/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/procps/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/procps/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/python3.sh b/.github/scripts/x86_64_Linux/bins/python3.sh index db66e7a15..34d62e861 100644 --- a/.github/scripts/x86_64_Linux/bins/python3.sh +++ b/.github/scripts/x86_64_Linux/bins/python3.sh @@ -33,7 +33,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/python3" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/python3/" && chmod -R 755 "$BASEUTILSDIR/python3/" #Strip - find "$BASEUTILSDIR/python3" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/python3" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #Test docker run --privileged -it --rm --network="bridge" -v "$BASEUTILSDIR/python3:/mnt" "alpine" "/mnt/python3" --version @@ -59,7 +59,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/python3/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/python3/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/python3/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/radare2.sh b/.github/scripts/x86_64_Linux/bins/radare2.sh index e3191dc6d..e1f77ae08 100644 --- a/.github/scripts/x86_64_Linux/bins/radare2.sh +++ b/.github/scripts/x86_64_Linux/bins/radare2.sh @@ -53,7 +53,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then [ "$(find ./ -mindepth 1 -maxdepth 1)" ] && sudo rsync -av --copy-links "./." "$BASEUTILSDIR/radare2" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/radare2/" && chmod -R 755 "$BASEUTILSDIR/radare2/" #Strip - find "$BASEUTILSDIR/radare2" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/radare2" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/radare2/"* @@ -76,7 +76,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/radare2/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/radare2/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/radare2/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/s6-dns.sh b/.github/scripts/x86_64_Linux/bins/s6-dns.sh index facb17456..dd1a35788 100644 --- a/.github/scripts/x86_64_Linux/bins/s6-dns.sh +++ b/.github/scripts/x86_64_Linux/bins/s6-dns.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/s6-dns" ; sudo rsync -av --copy-links "./result-bin/bin/." "$BASEUTILSDIR/s6-dns" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/s6-dns/" && chmod -R 755 "$BASEUTILSDIR/s6-dns/" #Strip - find "$BASEUTILSDIR/s6-dns" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/s6-dns" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -56,7 +56,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/s6-dns/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/s6-dns/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/s6-dns/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/s6-linux-init.sh b/.github/scripts/x86_64_Linux/bins/s6-linux-init.sh index 1fbd92f51..8e857cd6b 100644 --- a/.github/scripts/x86_64_Linux/bins/s6-linux-init.sh +++ b/.github/scripts/x86_64_Linux/bins/s6-linux-init.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/s6-linux-init" ; sudo rsync -av --copy-links "./result-bin/bin/." "$BASEUTILSDIR/s6-linux-init" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/s6-linux-init/" && chmod -R 755 "$BASEUTILSDIR/s6-linux-init/" #Strip - find "$BASEUTILSDIR/s6-linux-init" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/s6-linux-init" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -56,7 +56,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/s6-linux-init/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/s6-linux-init/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/s6-linux-init/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/s6-linux-utils.sh b/.github/scripts/x86_64_Linux/bins/s6-linux-utils.sh index 16f3bd512..b147e4338 100644 --- a/.github/scripts/x86_64_Linux/bins/s6-linux-utils.sh +++ b/.github/scripts/x86_64_Linux/bins/s6-linux-utils.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/s6-linux-utils" ; sudo rsync -av --copy-links "./result-bin/bin/." "$BASEUTILSDIR/s6-linux-utils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/s6-linux-utils/" && chmod -R 755 "$BASEUTILSDIR/s6-linux-utils/" #Strip - find "$BASEUTILSDIR/s6-linux-utils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/s6-linux-utils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -56,7 +56,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/s6-linux-utils/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/s6-linux-utils/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/s6-linux-utils/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/s6-networking.sh b/.github/scripts/x86_64_Linux/bins/s6-networking.sh index bae40c1ac..fabb49dff 100644 --- a/.github/scripts/x86_64_Linux/bins/s6-networking.sh +++ b/.github/scripts/x86_64_Linux/bins/s6-networking.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/s6-networking" ; sudo rsync -av --copy-links "./result-bin/bin/." "$BASEUTILSDIR/s6-networking" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/s6-networking/" && chmod -R 755 "$BASEUTILSDIR/s6-networking/" #Strip - find "$BASEUTILSDIR/s6-networking" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/s6-networking" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -56,7 +56,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/s6-networking/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/s6-networking/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/s6-networking/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/s6-portable-utils.sh b/.github/scripts/x86_64_Linux/bins/s6-portable-utils.sh index 9751e371c..930dee81a 100644 --- a/.github/scripts/x86_64_Linux/bins/s6-portable-utils.sh +++ b/.github/scripts/x86_64_Linux/bins/s6-portable-utils.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/s6-portable-utils" ; sudo rsync -av --copy-links "./result-bin/bin/." "$BASEUTILSDIR/s6-portable-utils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/s6-portable-utils/" && chmod -R 755 "$BASEUTILSDIR/s6-portable-utils/" #Strip - find "$BASEUTILSDIR/s6-portable-utils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/s6-portable-utils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -56,7 +56,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/s6-portable-utils/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/s6-portable-utils/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/s6-portable-utils/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/s6-rc.sh b/.github/scripts/x86_64_Linux/bins/s6-rc.sh index de7aa4f09..3fe184135 100644 --- a/.github/scripts/x86_64_Linux/bins/s6-rc.sh +++ b/.github/scripts/x86_64_Linux/bins/s6-rc.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/s6-rc" ; sudo rsync -av --copy-links "./result-bin/bin/." "$BASEUTILSDIR/s6-rc" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/s6-rc/" && chmod -R 755 "$BASEUTILSDIR/s6-rc/" #Strip - find "$BASEUTILSDIR/s6-rc" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/s6-rc" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -56,7 +56,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/s6-rc/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/s6-rc/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/s6-rc/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/s6.sh b/.github/scripts/x86_64_Linux/bins/s6.sh index 19884e9c3..5852cbef0 100644 --- a/.github/scripts/x86_64_Linux/bins/s6.sh +++ b/.github/scripts/x86_64_Linux/bins/s6.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/s6" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/s6" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/s6/" && chmod -R 755 "$BASEUTILSDIR/s6/" #Strip - find "$BASEUTILSDIR/s6" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/s6" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -56,7 +56,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/s6/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/s6/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/s6/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/sharutils.sh b/.github/scripts/x86_64_Linux/bins/sharutils.sh index 5fcf28ffc..971b3a18c 100644 --- a/.github/scripts/x86_64_Linux/bins/sharutils.sh +++ b/.github/scripts/x86_64_Linux/bins/sharutils.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/sharutils" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/sharutils" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/sharutils/" && chmod -R 755 "$BASEUTILSDIR/sharutils/" #Strip - find "$BASEUTILSDIR/sharutils" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/sharutils" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -56,7 +56,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/sharutils/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/sharutils/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/sharutils/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/squashfs-tools-ng.sh b/.github/scripts/x86_64_Linux/bins/squashfs-tools-ng.sh index 839bee7ab..f5a34aaab 100644 --- a/.github/scripts/x86_64_Linux/bins/squashfs-tools-ng.sh +++ b/.github/scripts/x86_64_Linux/bins/squashfs-tools-ng.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/squashfs-tools-ng" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/squashfs-tools-ng" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/squashfs-tools-ng/" && chmod -R 755 "$BASEUTILSDIR/squashfs-tools-ng/" #Strip - find "$BASEUTILSDIR/squashfs-tools-ng" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/squashfs-tools-ng" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -56,7 +56,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/squashfs-tools-ng/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/squashfs-tools-ng/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/squashfs-tools-ng/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/squashfstools.sh b/.github/scripts/x86_64_Linux/bins/squashfstools.sh index 32c30f028..95b204312 100644 --- a/.github/scripts/x86_64_Linux/bins/squashfstools.sh +++ b/.github/scripts/x86_64_Linux/bins/squashfstools.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/squashfstools" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/squashfstools" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/squashfstools/" && chmod -R 755 "$BASEUTILSDIR/squashfstools/" #Strip - find "$BASEUTILSDIR/squashfstools" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/squashfstools" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -56,7 +56,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/squashfstools/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/squashfstools/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/squashfstools/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/squashfuse.sh b/.github/scripts/x86_64_Linux/bins/squashfuse.sh index d504ce3fa..33d298c0b 100644 --- a/.github/scripts/x86_64_Linux/bins/squashfuse.sh +++ b/.github/scripts/x86_64_Linux/bins/squashfuse.sh @@ -31,7 +31,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/bin/." "$BINDIR/" sudo chown -R "$(whoami):$(whoami)" "$BINDIR/" && chmod -R 755 "$BINDIR/" #Strip - find "$BINDIR" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BINDIR" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 fi #-------------------------------------------------------# diff --git a/.github/scripts/x86_64_Linux/bins/sudo.sh b/.github/scripts/x86_64_Linux/bins/sudo.sh index 7b5150c9b..b6561a9d6 100644 --- a/.github/scripts/x86_64_Linux/bins/sudo.sh +++ b/.github/scripts/x86_64_Linux/bins/sudo.sh @@ -35,7 +35,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links --exclude="*/" "./result/etc/." "$BASEUTILSDIR/sudo" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/sudo/" && chmod -R 755 "$BASEUTILSDIR/sudo/" #Strip - find "$BASEUTILSDIR/sudo" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/sudo" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/sudo/"* @@ -58,7 +58,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/sudo/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/sudo/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/sudo/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/sysstat.sh b/.github/scripts/x86_64_Linux/bins/sysstat.sh index d845cfd1b..9e2f18ad9 100644 --- a/.github/scripts/x86_64_Linux/bins/sysstat.sh +++ b/.github/scripts/x86_64_Linux/bins/sysstat.sh @@ -49,7 +49,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then [ "$(find ./ -mindepth 1 -maxdepth 1)" ] && sudo rsync -av --copy-links "./." "$BASEUTILSDIR/sysstat" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/sysstat/" && chmod -R 755 "$BASEUTILSDIR/sysstat/" #Strip - find "$BASEUTILSDIR/sysstat" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/sysstat" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/sysstat/"* @@ -72,7 +72,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/sysstat/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/sysstat/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/sysstat/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/tar.sh b/.github/scripts/x86_64_Linux/bins/tar.sh index adc0ee5e3..775cd9e99 100644 --- a/.github/scripts/x86_64_Linux/bins/tar.sh +++ b/.github/scripts/x86_64_Linux/bins/tar.sh @@ -35,7 +35,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result/libexec/." "$BASEUTILSDIR/tar" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/tar/" && chmod -R 755 "$BASEUTILSDIR/tar/" #Strip - find "$BASEUTILSDIR/tar" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/tar" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/tar/"* @@ -58,7 +58,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/tar/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/tar/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/tar/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/unionfs-fuse.sh b/.github/scripts/x86_64_Linux/bins/unionfs-fuse.sh index 13e98b3b9..409e1b92e 100644 --- a/.github/scripts/x86_64_Linux/bins/unionfs-fuse.sh +++ b/.github/scripts/x86_64_Linux/bins/unionfs-fuse.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/unionfs-fuse" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/unionfs-fuse" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/unionfs-fuse/" && chmod -R 755 "$BASEUTILSDIR/unionfs-fuse/" #Strip - find "$BASEUTILSDIR/unionfs-fuse" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/unionfs-fuse" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -56,7 +56,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/unionfs-fuse/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/unionfs-fuse/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/unionfs-fuse/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/util-linux.sh b/.github/scripts/x86_64_Linux/bins/util-linux.sh index 51da67601..42a404ed5 100644 --- a/.github/scripts/x86_64_Linux/bins/util-linux.sh +++ b/.github/scripts/x86_64_Linux/bins/util-linux.sh @@ -34,7 +34,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result-bin/bin/." "$BASEUTILSDIR/util-linux" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/util-linux/" && chmod -R 755 "$BASEUTILSDIR/util-linux/" #Strip - find "$BASEUTILSDIR/util-linux" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/util-linux" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/util-linux/"* @@ -57,7 +57,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/util-linux/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/util-linux/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/util-linux/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/wirelesstools.sh b/.github/scripts/x86_64_Linux/bins/wirelesstools.sh index 26ab428b8..ee1603bbe 100644 --- a/.github/scripts/x86_64_Linux/bins/wirelesstools.sh +++ b/.github/scripts/x86_64_Linux/bins/wirelesstools.sh @@ -32,7 +32,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then mkdir -p "$BASEUTILSDIR/wirelesstools" ; sudo rsync -av --copy-links "./result/bin/." "$BASEUTILSDIR/wirelesstools" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/wirelesstools/" && chmod -R 755 "$BASEUTILSDIR/wirelesstools/" #Strip - find "$BASEUTILSDIR/wirelesstools" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/wirelesstools" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null nix-collect-garbage >/dev/null 2>&1 ; popd >/dev/null 2>&1 #-------------------------------------------------------# ##Meta @@ -56,7 +56,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/wirelesstools/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/wirelesstools/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/wirelesstools/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/xz.sh b/.github/scripts/x86_64_Linux/bins/xz.sh index c1ec7b613..b1aa3a523 100644 --- a/.github/scripts/x86_64_Linux/bins/xz.sh +++ b/.github/scripts/x86_64_Linux/bins/xz.sh @@ -34,7 +34,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result-bin/bin/." "$BASEUTILSDIR/xz" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/xz/" && chmod -R 755 "$BASEUTILSDIR/xz/" #Strip - find "$BASEUTILSDIR/xz" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/xz" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/xz/"* @@ -57,7 +57,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/xz/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/xz/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/xz/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/bins/zerotier.sh b/.github/scripts/x86_64_Linux/bins/zerotier.sh index e3bc14a43..12ac0f672 100644 --- a/.github/scripts/x86_64_Linux/bins/zerotier.sh +++ b/.github/scripts/x86_64_Linux/bins/zerotier.sh @@ -47,7 +47,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then rsync -av --copy-links --checksum "./zerotier-idtool" "/build-bins/zerotier-idtool" rsync -av --copy-links --checksum "./zerotier-one" "/build-bins/zerotier-one" #strip & info - find "/build-bins" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "/build-bins" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null find "/build-bins" -type f -exec file {} \; 2>/dev/null ' #Copy diff --git a/.github/scripts/x86_64_Linux/bins/zstd.sh b/.github/scripts/x86_64_Linux/bins/zstd.sh index b646648d6..a721a428a 100644 --- a/.github/scripts/x86_64_Linux/bins/zstd.sh +++ b/.github/scripts/x86_64_Linux/bins/zstd.sh @@ -33,7 +33,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then sudo rsync -av --copy-links "./result-bin/bin/." "$BASEUTILSDIR/zstd" sudo chown -R "$(whoami):$(whoami)" "$BASEUTILSDIR/zstd/" && chmod -R 755 "$BASEUTILSDIR/zstd/" #Strip - find "$BASEUTILSDIR/zstd" -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR/zstd" -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #-------------------------------------------------------# ##Meta file "$BASEUTILSDIR/zstd/"* @@ -56,7 +56,7 @@ if [ "$SKIP_BUILD" == "NO" ]; then EXTRA_BINS="$(awk -v bin="$BIN" '$0 != bin' "$TMP_METADIR/BINS.txt" | paste -sd ',' -)" && export EXTRA_BINS="${EXTRA_BINS}" REPO_URL="$(yq -r '.repo_url' $TMP_METADIR/temp.yaml)" && export REPO_URL="$REPO_URL" WEB_URL="$(yq -r '.web_url' $TMP_METADIR/temp.yaml)" && export WEB_URL="$WEB_URL" - rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/zstd/" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ + rclone lsjson --fast-list "r2:/bin/x86_64_Linux/Baseutils/zstd/" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" | \ jq --arg DESCRIPTION "$DESCRIPTION" --arg EXTRA_BINS "$EXTRA_BINS" --arg WEB_URL "$WEB_URL" --arg REPO_URL "$REPO_URL" -r 'include "./to_human_bytes" ; .[] | select(.Size != 0 and .Size != -1 and (.Name | test("\\.(7z|bz2|gz|json|md|rar|tar|tgz|tmp|txt|zip)$") | not)) | {name: (.Name), description: $DESCRIPTION, download_url: "https://bin.ajam.dev/x86_64_Linux/Baseutils/zstd/\(.Path)", size: (.Size | tonumber | bytes), build_date: (.ModTime | split(".")[0]), repo_url: $REPO_URL, web_url: $WEB_URL, extra_bins: $EXTRA_BINS}' | jq -s 'sort_by(.name)' > "$TMP_METADIR/INFO.json" for BIN in $(cat "$TMP_METADIR/BINS.txt" | sed 's/"//g'); do #Description diff --git a/.github/scripts/x86_64_Linux/build_debian.sh b/.github/scripts/x86_64_Linux/build_debian.sh index 8f1200242..e0e006bca 100644 --- a/.github/scripts/x86_64_Linux/build_debian.sh +++ b/.github/scripts/x86_64_Linux/build_debian.sh @@ -187,14 +187,14 @@ set +x #Chmod +xwr find "$BINDIR" -maxdepth 1 -type f -exec chmod +xwr {} \; 2>/dev/null #Strip - find "$BINDIR" -maxdepth 1 -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BINDIR" -maxdepth 1 -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #Rename anything with *_amd* find "$BINDIR" -type f -name '*_Linux' -exec sh -c 'newname=$(echo "$1" | sed "s/_amd_x86_64_Linux//"); mv "$1" "$newname"' sh {} \; #Strip || Cleanup [$BASEUTILSDIR] #Chmod +xwr find "$BASEUTILSDIR" -maxdepth 1 -type f -exec chmod +xwr {} \; 2>/dev/null #Strip - find "$BASEUTILSDIR" -maxdepth 1 -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR" -maxdepth 1 -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #Rename anything with *_amd* find "$BASEUTILSDIR" -type f -name '*_Linux' -exec sh -c 'newname=$(echo "$1" | sed "s/_amd_x86_64_Linux//"); mv "$1" "$newname"' sh {} \; #-------------------------------------------------------# @@ -227,7 +227,7 @@ set +x rclone delete "r2:/bin/x86_64_Linux/" --include "*.jq" --disable ListR --checkers="2000" --transfers="100" --progress rclone_main_dw() { - rclone copy "r2:/bin/x86_64_Linux/" "." --exclude="Baseutils/**" --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" --user-agent="$USER_AGENT" --buffer-size="10M" --s3-upload-concurrency="50" --s3-chunk-size="10M" --multi-thread-streams="50" --checkers="2000" --transfers="100" --retries="10" --check-first --checksum --copy-links --fast-list --progress + rclone copy "r2:/bin/x86_64_Linux/" "." --exclude="Baseutils/**" --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.tmp" --exclude="*.txt" --exclude="*.upx" --exclude="*.zip" --user-agent="$USER_AGENT" --buffer-size="10M" --s3-upload-concurrency="50" --s3-chunk-size="10M" --multi-thread-streams="50" --checkers="2000" --transfers="100" --retries="10" --check-first --checksum --copy-links --fast-list --progress } export -f rclone_main_dw sleep 60 && rclone_main_dw ; sleep 60 && rclone_main_dw ; sleep 60 && rclone_main_dw @@ -235,7 +235,7 @@ set +x #Chmod +xwr find "$BINDIR" -maxdepth 1 -type f -exec chmod +xwr {} \; 2>/dev/null #Strip - find "$BINDIR" -maxdepth 1 -type f -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BINDIR" -maxdepth 1 -type f ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #Rename anything with *_amd* find "$BINDIR" -type f -name '*_Linux' -exec sh -c 'newname=$(echo "$1" | sed "s/_amd_x86_64_Linux//"); mv "$1" "$newname"' sh {} \; #File @@ -258,7 +258,7 @@ set +x cd "$BASEUTILSDIR" rclone_base_dw() { - rclone copy "r2:/bin/x86_64_Linux/Baseutils/" "." --exclude="*.7z" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.txt" --exclude="*.tmp" --exclude="*.upx" --exclude="*.yaml" --exclude="*.zip" --user-agent="$USER_AGENT" --buffer-size="10M" --s3-upload-concurrency="50" --s3-chunk-size="10M" --multi-thread-streams="50" --checkers="2000" --transfers="100" --retries="10" --check-first --checksum --copy-links --fast-list --progress + rclone copy "r2:/bin/x86_64_Linux/Baseutils/" "." --exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.txt" --exclude="*.tmp" --exclude="*.upx" --exclude="*.yaml" --exclude="*.zip"--exclude="*.7z" --exclude="*.AppImage" --exclude="*.gz" --exclude="*.jq" --exclude="*.json" --exclude="*.log" --exclude="*.md" --exclude="*.tar" --exclude="*.tgz" --exclude="*.txt" --exclude="*.tmp" --exclude="*.upx" --exclude="*.yaml" --exclude="*.zip" --user-agent="$USER_AGENT" --buffer-size="10M" --s3-upload-concurrency="50" --s3-chunk-size="10M" --multi-thread-streams="50" --checkers="2000" --transfers="100" --retries="10" --check-first --checksum --copy-links --fast-list --progress } export -f rclone_base_dw sleep 60 && rclone_base_dw ; sleep 60 && rclone_base_dw ; sleep 60 && rclone_base_dw @@ -266,7 +266,7 @@ set +x #Chmod +xwr find "$BASEUTILSDIR" -type f -executable -exec chmod +xwr {} \; 2>/dev/null #Strip - find "$BASEUTILSDIR" -type f -executable -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null + find "$BASEUTILSDIR" -type f -executable ! -name "*.AppImage" -exec strip --strip-debug --strip-dwo --strip-unneeded --preserve-dates "{}" \; 2>/dev/null #Rename anything with *_amd* find "$BASEUTILSDIR" -type f -name '*_Linux' -exec sh -c 'newname=$(echo "$1" | sed "s/_amd_x86_64_Linux//"); mv "$1" "$newname"' sh {} \; #File diff --git a/.github/scripts/x86_64_Linux/init_debian.sh b/.github/scripts/x86_64_Linux/init_debian.sh index 4453ed5b2..df3aa34ec 100644 --- a/.github/scripts/x86_64_Linux/init_debian.sh +++ b/.github/scripts/x86_64_Linux/init_debian.sh @@ -134,12 +134,12 @@ #PYTHON_VERSION_LATEST="$(curl -qfsSL "https://devguide.python.org/versions/" | grep -oP 'Python \d+\.\d+' | sed 's/Python //' | sort -V | uniq | tail -n 1)" && export PYTHON_VERSION_LATEST="$PYTHON_VERSION_LATEST" #sudo apt-get install "python${PYTHON_VERSION_LATEST}" -y #Install Build Des - sudo apt-get install aria2 automake bc binutils b3sum build-essential ca-certificates ccache diffutils dos2unix gawk lzip jq libtool libtool-bin make musl musl-dev musl-tools p7zip-full rsync texinfo wget -y 2>/dev/null + sudo apt-get install aria2 automake bc binutils b3sum build-essential ca-certificates ccache diffutils dos2unix gawk imagemagick lzip jq libtool libtool-bin make musl musl-dev musl-tools p7zip-full rsync texinfo wget -y 2>/dev/null sudo apt-get install -y --no-install-recommends autoconf automake autopoint binutils bison build-essential byacc ca-certificates clang flex file jq libtool libtool-bin patch patchelf pkg-config qemu-user-static scons wget 2>/dev/null sudo apt-get install devscripts -y --no-install-recommends 2>/dev/null sudo apt-get install cmake -y #Re - sudo apt-get install aria2 automake bc binutils b3sum build-essential ca-certificates ccache diffutils dos2unix gawk lzip jq libtool libtool-bin make musl musl-dev musl-tools p7zip-full rsync texinfo wget -y 2>/dev/null + sudo apt-get install aria2 automake bc binutils b3sum build-essential ca-certificates ccache diffutils dos2unix gawk imagemagick lzip jq libtool libtool-bin make musl musl-dev musl-tools p7zip-full rsync texinfo wget -y 2>/dev/null sudo apt-get install -y --no-install-recommends autoconf automake autopoint binutils bison build-essential byacc ca-certificates clang flex file jq libtool libtool-bin patch patchelf pkg-config qemu-user-static scons wget 2>/dev/null sudo apt-get install devscripts -y --no-install-recommends 2>/dev/null sudo apt-get install cmake -y