system/ripgrep: Use static.crates.io, script tidy ups.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

2 files changed, 69 insertions, 76 deletions

diff --git a/system/ripgrep/ripgrep.SlackBuild b/system/ripgrep/ripgrep.SlackBuild
index 879ed3e8f4..5fc860a545 100644
--- a/system/ripgrep/ripgrep.SlackBuild
+++ b/system/ripgrep/ripgrep.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for ripgrep
 
 # Copyright 2017-2021 Andrew Clemons, Wellington New Zealand
+# Copyright 2023 Andrew Clemons, Toyko Japan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,8 +26,9 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=ripgrep
+BINNAM=rg
 VERSION=${VERSION:-13.0.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -44,9 +46,6 @@ if [ -z "$ARCH" ]; then
   fi
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -58,19 +57,15 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-  CARGOTARGET="--target i586-unknown-linux-gnu"
+  CARGOTARGET="--target $ARCH-unknown-linux-gnu"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-  CARGOTARGET="--target i686-unknown-linux-gnu"
-elif [ "$ARCH" = "x86_64" ]; then
+  CARGOTARGET="--target $ARCH-unknown-linux-gnu"
+elif [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "aarch64" ] ; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-  CARGOTARGET="--target x86_64-unknown-linux-gnu"
+  CARGOTARGET="--target $ARCH-unknown-linux-gnu"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
   CARGOTARGET=""
 fi
 
@@ -85,10 +80,8 @@ cd $PRGNAM-$VERSION
 
 # build offline
 # configuration tells cargo to use the configured directory
-# for dependencies intead of downloading from crates.io
-rm -rf .cargo
-mkdir .cargo
-cat << EOF >> .cargo/config
+# for dependencies instead of downloading from crates.io
+cat << EOF > .cargo/config
 [source.crates-io]
 registry = 'https://github.com/rust-lang/crates.io-index'
 replace-with = 'vendored-sources'
@@ -149,16 +142,16 @@ cargo build --features 'pcre2' --release $CARGOTARGET
 
 mkdir -p $PKG/usr/bin/
 
-find target -name rg -exec install -m 755 {} $PKG/usr/bin/rg \;
+find target -name $BINNAM -exec install -m 755 {} $PKG/usr/bin/$BINNAM \;
 
 mkdir -p $PKG/usr/share/bash-completion/completions/
-find target -name rg.bash -exec install -m644 {} $PKG/usr/share/bash-completion/completions/rg \;
+find target -name $BINNAM.bash -exec install -m644 {} $PKG/usr/share/bash-completion/completions/$BINNAM \;
 
 mkdir -p $PKG/usr/share/zsh/site-functions/
-find target -name _rg.ps1 -exec install -m644 {} $PKG/usr/share/zsh/site-functions/_rg \;
+find target -name _$BINNAM.ps1 -exec install -m644 {} $PKG/usr/share/zsh/site-functions/_$BINNAM \;
 
 mkdir -p $PKG/usr/man/man1
-find target -name rg.1 -exec install -m644 {} $PKG/usr/man/man1/rg.1 \;
+find target -name $BINNAM.1 -exec install -m644 {} $PKG/usr/man/man1/$BINNAM.1 \;
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
diff --git a/system/ripgrep/ripgrep.info b/system/ripgrep/ripgrep.info
index 855afc1b1e..7ba8bd6100 100644
--- a/system/ripgrep/ripgrep.info
+++ b/system/ripgrep/ripgrep.info
@@ -2,62 +2,62 @@ PRGNAM="ripgrep"
 VERSION="13.0.0"
 HOMEPAGE="https://github.com/BurntSushi/ripgrep"
 DOWNLOAD="https://github.com/BurntSushi/ripgrep/archive/13.0.0/ripgrep-13.0.0.tar.gz \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.18.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/base64/base64-0.13.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bstr/bstr-0.2.16.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bytecount/bytecount-0.6.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.68.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-1.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-channel/crossbeam-channel-0.5.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.8.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding_rs/encoding_rs-0.8.28.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding_rs_io/encoding_rs_io-0.1.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fs_extra/fs_extra-1.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/glob/glob-0.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.18.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/itoa/itoa-0.4.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/jemalloc-sys/jemalloc-sys-0.3.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/jemallocator/jemallocator-0.3.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/jobserver/jobserver-0.1.22.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.97.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libm/libm-0.1.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/memmap2/memmap2-0.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.13.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/once_cell/once_cell-1.7.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/packed_simd_2/packed_simd_2-0.3.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pcre2-sys/pcre2-sys-0.2.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pcre2/pcre2-0.2.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.19.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.27.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-1.0.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-automata/regex-automata-0.1.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.25.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.5.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ryu/ryu-1.0.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/same-file/same-file-1.0.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.126.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.126.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.64.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.8.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.73.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/termcolor/termcolor-1.1.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-1.1.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.2.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/walkdir/walkdir-2.3.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.9.crate"
+          https://static.crates.io/crates/aho-corasick/aho-corasick-0.7.18.crate \
+          https://static.crates.io/crates/atty/atty-0.2.14.crate \
+          https://static.crates.io/crates/base64/base64-0.13.0.crate \
+          https://static.crates.io/crates/bitflags/bitflags-1.2.1.crate \
+          https://static.crates.io/crates/bstr/bstr-0.2.16.crate \
+          https://static.crates.io/crates/bytecount/bytecount-0.6.2.crate \
+          https://static.crates.io/crates/cc/cc-1.0.68.crate \
+          https://static.crates.io/crates/cfg-if/cfg-if-0.1.10.crate \
+          https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \
+          https://static.crates.io/crates/clap/clap-2.33.3.crate \
+          https://static.crates.io/crates/crossbeam-channel/crossbeam-channel-0.5.1.crate \
+          https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.5.crate \
+          https://static.crates.io/crates/encoding_rs/encoding_rs-0.8.28.crate \
+          https://static.crates.io/crates/encoding_rs_io/encoding_rs_io-0.1.7.crate \
+          https://static.crates.io/crates/fnv/fnv-1.0.7.crate \
+          https://static.crates.io/crates/fs_extra/fs_extra-1.2.0.crate \
+          https://static.crates.io/crates/glob/glob-0.3.0.crate \
+          https://static.crates.io/crates/hermit-abi/hermit-abi-0.1.18.crate \
+          https://static.crates.io/crates/itoa/itoa-0.4.7.crate \
+          https://static.crates.io/crates/jemalloc-sys/jemalloc-sys-0.3.2.crate \
+          https://static.crates.io/crates/jemallocator/jemallocator-0.3.2.crate \
+          https://static.crates.io/crates/jobserver/jobserver-0.1.22.crate \
+          https://static.crates.io/crates/lazy_static/lazy_static-1.4.0.crate \
+          https://static.crates.io/crates/libc/libc-0.2.97.crate \
+          https://static.crates.io/crates/libm/libm-0.1.4.crate \
+          https://static.crates.io/crates/log/log-0.4.14.crate \
+          https://static.crates.io/crates/memchr/memchr-2.4.0.crate \
+          https://static.crates.io/crates/memmap2/memmap2-0.3.0.crate \
+          https://static.crates.io/crates/num_cpus/num_cpus-1.13.0.crate \
+          https://static.crates.io/crates/once_cell/once_cell-1.7.2.crate \
+          https://static.crates.io/crates/packed_simd_2/packed_simd_2-0.3.5.crate \
+          https://static.crates.io/crates/pcre2-sys/pcre2-sys-0.2.5.crate \
+          https://static.crates.io/crates/pcre2/pcre2-0.2.3.crate \
+          https://static.crates.io/crates/pkg-config/pkg-config-0.3.19.crate \
+          https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.27.crate \
+          https://static.crates.io/crates/quote/quote-1.0.9.crate \
+          https://static.crates.io/crates/regex-automata/regex-automata-0.1.10.crate \
+          https://static.crates.io/crates/regex-syntax/regex-syntax-0.6.25.crate \
+          https://static.crates.io/crates/regex/regex-1.5.4.crate \
+          https://static.crates.io/crates/ryu/ryu-1.0.5.crate \
+          https://static.crates.io/crates/same-file/same-file-1.0.6.crate \
+          https://static.crates.io/crates/serde/serde-1.0.126.crate \
+          https://static.crates.io/crates/serde_derive/serde_derive-1.0.126.crate \
+          https://static.crates.io/crates/serde_json/serde_json-1.0.64.crate \
+          https://static.crates.io/crates/strsim/strsim-0.8.0.crate \
+          https://static.crates.io/crates/syn/syn-1.0.73.crate \
+          https://static.crates.io/crates/termcolor/termcolor-1.1.2.crate \
+          https://static.crates.io/crates/textwrap/textwrap-0.11.0.crate \
+          https://static.crates.io/crates/thread_local/thread_local-1.1.3.crate \
+          https://static.crates.io/crates/unicode-width/unicode-width-0.1.8.crate \
+          https://static.crates.io/crates/unicode-xid/unicode-xid-0.2.2.crate \
+          https://static.crates.io/crates/walkdir/walkdir-2.3.2.crate \
+          https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi-util/winapi-util-0.1.5.crate \
+          https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi/winapi-0.3.9.crate"
 MD5SUM="3080265a3ccc09bdc0c81527b09afa15 \
         425b8fdf70df59998d9b7c89083e48d1 \
         142cb4b9a653e56e56311f0c883b8582 \