commit b4390368bd8871eb3be1819783e41c73f64e729a
| author | 斟酌 鵬兄 <tgckpg@gmail.com> |
|---|
| date | 2026-06-28T01:47:15Z |
|---|
| subject | use download_sig if possible |
|---|
commit b4390368bd8871eb3be1819783e41c73f64e729a
Author: 斟酌 鵬兄 <tgckpg@gmail.com>
Date: 2026-06-28T01:47:15Z
use download_sig if possible
---
bash/core/{05_config.bash => 05_defaults.bash} | 6 +----
bash/defaults.conf | 4 ---
bash/dist/rbashrc | 10 +++----
bash/dist/sources.list | 2 +-
bash/sources/16_keystore | 36 +++++++-------------------
5 files changed, 14 insertions(+), 44 deletions(-)
diff --git a/bash/core/05_config.bash b/bash/core/05_defaults.bash
similarity index 56%
rename from bash/core/05_config.bash
rename to bash/core/05_defaults.bash
index 420272b..2e24144 100755
--- a/bash/core/05_config.bash
+++ b/bash/core/05_defaults.bash
@@ -3,16 +3,12 @@ __rbash_init_config() {
return 0
fi
- rbash_download "$RBASH_REMOTE/$RBASH_REPO/raw/$RBASH_REF/$RBASH_PATH/defaults.conf" \
- > "$RBASH_CONFIG" || {
- cat > "$RBASH_CONFIG" <<'EOF'
+ cat > "$RBASH_CONFIG" <<'EOF'
rbash_load "sources/10_aliases"
rbash_load "sources/12_shortcuts"
-rbash_load "sources/20_fast-greps"
rbash_load "sources/40_go-command"
rbash_load "sources/41_pivot-command"
EOF
- }
chmod 600 "$RBASH_CONFIG"
}
diff --git a/bash/defaults.conf b/bash/defaults.conf
deleted file mode 100644
index a2060ed..0000000
--- a/bash/defaults.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-rbash_load "sources/10_aliases"
-rbash_load "sources/12_shortcuts"
-rbash_load "sources/40_go-command"
-rbash_load "sources/41_pivot-command"
diff --git a/bash/dist/rbashrc b/bash/dist/rbashrc
index 8d6061e..aa40cc6 100755
--- a/bash/dist/rbashrc
+++ b/bash/dist/rbashrc
@@ -18,7 +18,7 @@ RBASH_CONFIG="$RBASH_HOME/config"
RBASH_ENV="$RBASH_HOME/env"
RBASH_MERGED="$RBASH_CACHE_DIR/merged"
RBASH_BIN="$RBASH_HOME/bin"
-RBASH_SOURCES_SUM="073b8c3e23fe1a4bc0d479cab97877357e56df00efd9371008613e6aff8f40df"
+RBASH_SOURCES_SUM="e221c016049e096ecef46d03b52864fe99ec84f6dba560707ca4f1a44368e6a9"
# ---- rbash: bash/core/00_env.bash ----
@@ -37,23 +37,19 @@ fi
_RBASH_LOADED=
-# ---- rbash: bash/core/05_config.bash ----
+# ---- rbash: bash/core/05_defaults.bash ----
__rbash_init_config() {
if [ -f "$RBASH_CONFIG" ]; then
return 0
fi
- rbash_download "$RBASH_REMOTE/$RBASH_REPO/raw/$RBASH_REF/$RBASH_PATH/defaults.conf" \
- > "$RBASH_CONFIG" || {
- cat > "$RBASH_CONFIG" <<'EOF'
+ cat > "$RBASH_CONFIG" <<'EOF'
rbash_load "sources/10_aliases"
rbash_load "sources/12_shortcuts"
-rbash_load "sources/20_fast-greps"
rbash_load "sources/40_go-command"
rbash_load "sources/41_pivot-command"
EOF
- }
chmod 600 "$RBASH_CONFIG"
}
diff --git a/bash/dist/sources.list b/bash/dist/sources.list
index 0e0d282..2a2cbc9 100644
--- a/bash/dist/sources.list
+++ b/bash/dist/sources.list
@@ -3,7 +3,7 @@ e50644286373408263ce5a6f455bf967585a767cce055e67423bd33fdafeab9f sources/12_sho
043a103f7602304732b37c8219ba4f74bc8af37278fc6d2f63d642ef9a29a6fe sources/13_shortcuts_macos
3340cf44a97771e6839e03443e8276c25804e0918c0415b1ffe0112d060cee2d sources/14_shortcuts_greps
a0d62f10f39fa988d8ff8ce13a1751488e6bad1662c3b97ab8ef3fa09c702666 sources/15_gpg-agent
-077615a28c61cb76ca82fb8aa8aed18a661b8fbddc3dfde54467d84aa512edc2 sources/16_keystore
+4b3c7bdc57fbc94e072e74399cd800c3693ff635fa9064f9e5d05c1ac92e255c sources/16_keystore
570a67928ad4eb2ae343ebc3eee39413989087388fe35e0cd675573add6730b0 sources/17_kcontext
f45e3d068475a40b838336f675948d07b544967d03fbf491abd70e131db38fb0 sources/18_kotp
9d26839015cf799a0cb2661c49be3f1197fbbc5faf954302eeac93696c85a221 sources/19_k8s_funcs
diff --git a/bash/sources/16_keystore b/bash/sources/16_keystore
index a99f626..050f7f0 100644
--- a/bash/sources/16_keystore
+++ b/bash/sources/16_keystore
@@ -647,43 +647,25 @@ function _kstoredel {
}
function _kstoredl-s3au {
- local p tmp _NAME
+ local _URL="https://sgit.k8s.astropenguin.net/penguin/s3-arch-utils/raw/master/$2"
+ local _NAME=$( basename "${2//_/-}" .sh )
- p="https://sgit.k8s.astropenguin.net/penguin/s3-arch-utils/raw/master"
- _CSUM=$1
- _NAME=$2
-
- tmp=$( mktemp )
- rbash_download "$p/$_NAME" > $tmp
- sha256sum $tmp | grep -q "$_CSUM"
+ rbash_download_sig "$1" "$_URL" "$RBASH_BIN/$_NAME"
if [ $? -eq 0 ]; then
- _NAME=$( basename "${_NAME//_/-}" .sh )
- mv $tmp "$RBASH_BIN/$_NAME"
- chmod +x "$RBASH_BIN/$_NAME"
echo "> $RBASH_BIN/$_NAME"
- else
- echo "$_NAME: Signature mismatch"
- return 1
+ chmod +x "$RBASH_BIN/$_NAME"
fi
}
function _kstoredl-kstorecred {
- local p tmp _NAME
+ local _URL="https://penguins-workspace.s3.ap-southeast-1.astropenguin.net/keystore/kstorecred.exe"
+ local _NAME="kstorecred"
+ local _CSUM="031b4474b8eb8deafbb96df73b79f8b654fd3c2209f041fd34cb6f494791bcd4"
- _NAME="kstorecred"
- p="https://penguins-workspace.s3.ap-southeast-1.astropenguin.net/keystore/kstorecred.exe"
- _CSUM="031b4474b8eb8deafbb96df73b79f8b654fd3c2209f041fd34cb6f494791bcd4"
-
- tmp=$( mktemp )
- rbash_download "$p" > $tmp
- sha256sum $tmp | grep -q "$_CSUM"
+ rbash_download_sig "$_CSUM" "$_URL" "$RBASH_BIN/$_NAME"
if [ $? -eq 0 ]; then
- mv $tmp "$RBASH_BIN/$_NAME"
- chmod +x "$RBASH_BIN/$_NAME"
echo "> $RBASH_BIN/$_NAME"
- else
- echo "$_NAME: Signature mismatch"
- return 1
+ chmod +x "$RBASH_BIN/$_NAME"
fi
}