From 62c14626dbede6f8133e655f2e0b601ba987482d Mon Sep 17 00:00:00 2001 From: weyu <985695055@qq.com> Date: Mon, 31 Mar 2025 10:52:10 +0800 Subject: [PATCH] fix --- libs/aliyun.sh | 2 + libs/common.sh | 76 ++++++++++++++++++++------------ sed/cdn-images.mailchimp.com.sed | 1 - sed/cdn.jsdelivr.net.sed | 1 - sed/cdnjs.cloudflare.com.sed | 1 - sed/code.jquery.com.sed | 1 - sed/maxcdn.bootstrapcdn.com.sed | 1 - sed/unpkg.com.sed | 1 - sed/www.google-analytics.com.sed | 1 - webs/litmuschaos/toto.sh | 15 ++++--- 10 files changed, 59 insertions(+), 41 deletions(-) diff --git a/libs/aliyun.sh b/libs/aliyun.sh index 5c45212..912ed56 100755 --- a/libs/aliyun.sh +++ b/libs/aliyun.sh @@ -1,8 +1,10 @@ install_aliyun_ossutil(){ if [ ! -f ./ossutil ];then + log_info "=============================================> 当前路径下无 ossutil，下载并安装到本地 ./ossutil 和 /usr/bin/ossutil" wget -q -O ossutil-2.0.6-beta.01091200-linux-amd64.zip https://gosspublic.alicdn.com/ossutil/v2-beta/2.0.6-beta.01091200/ossutil-2.0.6-beta.01091200-linux-amd64.zip unzip ossutil-2.0.6-beta.01091200-linux-amd64.zip cp ossutil-2.0.6-beta.01091200-linux-amd64/ossutil ./ossutil chmod +x ./ossutil + sudo cp ./ossutil /usr/bin/ fi } diff --git a/libs/common.sh b/libs/common.sh index 46564a0..8155d9f 100755 --- a/libs/common.sh +++ b/libs/common.sh @@ -27,45 +27,65 @@ log_error(){ exit 1 } +install_hugo_base(){ + hugo_url=$1 + pkg_name=`echo $hugo_url|awk -F'/' '{print $NF}'` + + log_info "=============================================> 下载并安装 hugo: $pkg_name" + wget -q -O $hugo_url + tar xf $pkg_name + + sudo cp ./hugo /usr/bin/ + sudo chmod +x /usr/bin/hugo + + # -x FILE + # FILE exists and execute (or search) permission is granted + if [ -x /usr/bin/hugo ];then + log_error "=============================================> hugo 安装失败: /usr/bin/hugo 文件不存在或者没有成功设置可执行权限" + fi +} + install_hugo(){ - echo "=============================================> 安装 Hugo V0.133.0" + log_info "=============================================> 安装 Hugo V0.133.0" wget -q https://github.com/gohugoio/hugo/releases/download/v0.133.0/hugo_extended_0.133.0_linux-amd64.tar.gz tar xf hugo_extended_0.133.0_linux-amd64.tar.gz sudo cp ./hugo /usr/bin/ sudo chmod +x /usr/bin/hugo } + install_hugo_v65_3(){ - echo "=============================================> 安装 Hugo V0.65.3" - wget -q https://github.com/gohugoio/hugo/releases/download/v0.65.3/hugo_extended_0.65.3_Linux-64bit.tar.gz - tar xf hugo_extended_0.65.3_Linux-64bit.tar.gz - sudo cp ./hugo /usr/bin/ - sudo chmod +x /usr/bin/hugo + install_hugo_base https://github.com/gohugoio/hugo/releases/download/v0.65.3/hugo_extended_0.65.3_Linux-64bit.tar.gz + # log_info "=============================================> 安装 Hugo V0.65.3" + # wget -q https://github.com/gohugoio/hugo/releases/download/v0.65.3/hugo_extended_0.65.3_Linux-64bit.tar.gz + # tar xf hugo_extended_0.65.3_Linux-64bit.tar.gz + # sudo cp ./hugo /usr/bin/ + # sudo chmod +x /usr/bin/hugo } install_hugo_v66(){ - echo "=============================================> 安装 Hugo V0.66.0" + log_info "=============================================> 安装 Hugo V0.66.0" wget -q https://github.com/gohugoio/hugo/releases/download/v0.66.0/hugo_extended_0.66.0_Linux-64bit.tar.gz tar xf hugo_extended_0.66.0_Linux-64bit.tar.gz sudo cp ./hugo /usr/bin/ sudo chmod +x /usr/bin/hugo } install_hugo_v68_3(){ - echo "=============================================> 安装 Hugo V0.68.3" + log_info "=============================================> 安装 Hugo V0.68.3" wget -q https://github.com/gohugoio/hugo/releases/download/v0.68.3/hugo_extended_0.68.3_Linux-64bit.tar.gz tar xf hugo_extended_0.68.3_Linux-64bit.tar.gz sudo cp ./hugo /usr/bin/ sudo chmod +x /usr/bin/hugo } install_hugo_v80(){ - echo "=============================================> 安装 Hugo V0.80.0" + log_info "=============================================> 安装 Hugo V0.80.0" wget -q https://github.com/gohugoio/hugo/releases/download/v0.80.0/hugo_extended_0.80.0_Linux-64bit.tar.gz tar xf hugo_extended_0.80.0_Linux-64bit.tar.gz sudo cp ./hugo /usr/bin/ sudo chmod +x /usr/bin/hugo } install_hugo_v83_1(){ - echo "=============================================> 安装 Hugo V0.83.1" + log_info "=============================================> 安装 Hugo V0.83.1" wget -q https://github.com/gohugoio/hugo/releases/download/v0.83.1/hugo_extended_0.83.1_Linux-64bit.tar.gz tar xf hugo_extended_0.83.1_Linux-64bit.tar.gz sudo cp ./hugo /usr/bin/ @@ -73,7 +93,7 @@ install_hugo_v83_1(){ } install_hugo_v93_2(){ - echo "=============================================> 安装 Hugo V0.93.2" + log_info "=============================================> 安装 Hugo V0.93.2" wget -q https://github.com/gohugoio/hugo/releases/download/v0.93.2/hugo_extended_0.93.2_Linux-64bit.tar.gz tar xf hugo_extended_0.93.2_Linux-64bit.tar.gz sudo cp ./hugo /usr/bin/ @@ -81,7 +101,7 @@ install_hugo_v93_2(){ } install_hugo_v93_2(){ - echo "=============================================> 安装 Hugo V0.93.2" + log_info "=============================================> 安装 Hugo V0.93.2" wget -q https://github.com/gohugoio/hugo/releases/download/v0.93.2/hugo_extended_0.93.2_Linux-64bit.tar.gz tar xf hugo_extended_0.93.2_Linux-64bit.tar.gz sudo cp ./hugo /usr/bin/ @@ -90,7 +110,7 @@ install_hugo_v93_2(){ install_hugo_v99_1(){ - echo "=============================================> 安装 Hugo V0.99.1" + log_info "=============================================> 安装 Hugo V0.99.1" wget -q https://github.com/gohugoio/hugo/releases/download/v0.99.1/hugo_extended_0.99.1_Linux-64bit.tar.gz tar xf hugo_extended_0.99.1_Linux-64bit.tar.gz sudo cp ./hugo /usr/bin/ @@ -98,7 +118,7 @@ install_hugo_v99_1(){ } install_hugo_v100_2(){ - echo "=============================================> 安装 Hugo V0.100.2" + log_info "=============================================> 安装 Hugo V0.100.2" wget -q https://github.com/gohugoio/hugo/releases/download/v0.100.2/hugo_extended_0.100.2_Linux-64bit.tar.gz tar xf hugo_extended_0.100.2_Linux-64bit.tar.gz sudo cp ./hugo /usr/bin/ @@ -108,7 +128,7 @@ install_hugo_v100_2(){ install_hugo_v102_3(){ - echo "=============================================> 安装 Hugo V0.102.3" + log_info "=============================================> 安装 Hugo V0.102.3" wget -q https://github.com/gohugoio/hugo/releases/download/v0.102.3/hugo_extended_0.102.3_Linux-64bit.tar.gz tar xf hugo_extended_0.102.3_Linux-64bit.tar.gz sudo cp ./hugo /usr/bin/ @@ -116,7 +136,7 @@ install_hugo_v102_3(){ } install_hugo_v108(){ - echo "=============================================> 安装 Hugo V0.108.0" + log_info "=============================================> 安装 Hugo V0.108.0" wget -q https://github.com/gohugoio/hugo/releases/download/v0.108.0/hugo_extended_0.108.0_Linux-64bit.tar.gz tar xf hugo_extended_0.108.0_Linux-64bit.tar.gz sudo cp ./hugo /usr/bin/ @@ -124,7 +144,7 @@ install_hugo_v108(){ } install_hugo_v111_3(){ - echo "=============================================> 安装 Hugo V0.111.3" + log_info "=============================================> 安装 Hugo V0.111.3" wget -q https://github.com/gohugoio/hugo/releases/download/v0.111.3/hugo_extended_0.111.3_linux-amd64.tar.gz tar xf hugo_extended_0.111.3_linux-amd64.tar.gz sudo cp ./hugo /usr/bin/ @@ -132,7 +152,7 @@ install_hugo_v111_3(){ } install_hugo_v114(){ - echo "=============================================> 安装 Hugo V0.114.0" + log_info "=============================================> 安装 Hugo V0.114.0" wget -q https://github.com/gohugoio/hugo/releases/download/v0.114.0/hugo_extended_0.114.0_linux-amd64.tar.gz tar xf hugo_extended_0.114.0_linux-amd64.tar.gz sudo cp ./hugo /usr/bin/ @@ -140,7 +160,7 @@ install_hugo_v114(){ } install_hugo_v120(){ - echo "=============================================> 安装 Hugo V0.120.0" + log_info "=============================================> 安装 Hugo V0.120.0" wget -q https://github.com/gohugoio/hugo/releases/download/v0.120.0/hugo_extended_0.120.0_linux-amd64.tar.gz tar xf hugo_extended_0.120.0_linux-amd64.tar.gz sudo cp ./hugo /usr/bin/ @@ -148,7 +168,7 @@ install_hugo_v120(){ } install_hugo_v122(){ - echo "=============================================> 安装 Hugo V0.122.0" + log_info "=============================================> 安装 Hugo V0.122.0" wget -q https://github.com/gohugoio/hugo/releases/download/v0.122.0/hugo_extended_0.122.0_linux-amd64.tar.gz tar xf hugo_extended_0.122.0_linux-amd64.tar.gz sudo cp ./hugo /usr/bin/ @@ -156,7 +176,7 @@ install_hugo_v122(){ } install_hugo_v124_1(){ - echo "=============================================> 安装 Hugo V0.124.1" + log_info "=============================================> 安装 Hugo V0.124.1" wget -q https://github.com/gohugoio/hugo/releases/download/v0.124.1/hugo_extended_0.124.1_linux-amd64.tar.gz tar xf hugo_extended_0.124.1_linux-amd64.tar.gz sudo cp ./hugo /usr/bin/ @@ -164,14 +184,14 @@ install_hugo_v124_1(){ } install_hugo_v136_5(){ - echo "=============================================> 安装 Hugo V0.136.5" + log_info "=============================================> 安装 Hugo V0.136.5" wget -q https://github.com/gohugoio/hugo/releases/download/v0.136.5/hugo_extended_0.136.5_linux-amd64.tar.gz tar xf hugo_extended_0.136.5_linux-amd64.tar.gz sudo cp ./hugo /usr/bin/ sudo chmod +x /usr/bin/hugo } install_hugo_v139_3(){ - echo "=============================================> 安装 Hugo V0.139.3" + log_info "=============================================> 安装 Hugo V0.139.3" wget -q https://github.com/gohugoio/hugo/releases/download/v0.139.3/hugo_extended_0.139.3_linux-amd64.tar.gz tar xf hugo_extended_0.139.3_linux-amd64.tar.gz sudo cp ./hugo /usr/bin/ @@ -179,7 +199,7 @@ install_hugo_v139_3(){ } install_hugo_v143_1(){ - echo "=============================================> 安装 Hugo V0.143.1" + log_info "=============================================> 安装 Hugo V0.143.1" wget -q https://github.com/gohugoio/hugo/releases/download/v0.143.1/hugo_extended_0.143.1_linux-amd64.tar.gz tar xf hugo_extended_0.143.1_linux-amd64.tar.gz sudo cp ./hugo /usr/bin/ @@ -187,7 +207,7 @@ install_hugo_v143_1(){ } install_hugo_v145(){ - echo "=============================================> 安装 Hugo V0.145.0" + log_info "=============================================> 安装 Hugo V0.145.0" wget -q https://github.com/gohugoio/hugo/releases/download/v0.145.0/hugo_extended_0.145.0_linux-amd64.tar.gz tar xf hugo_extended_0.145.0_linux-amd64.tar.gz sudo cp ./hugo /usr/bin/ @@ -198,20 +218,20 @@ install_hugo_v145(){ install_postcss(){ - echo "=============================================> 安装 postCSS" + log_info "=============================================> 安装 postCSS" npm i -D postcss postcss-cli autoprefixer } check_cdn_change(){ - echo "=============================================> 以下文件进行了 cdn 替换，请确认文件在 https://cdn.cncfstack.com 是否存在" + log_info "=============================================> 以下文件进行了 cdn 替换，请确认文件在 https://cdn.cncfstack.com 是否存在" grep "cdn.cncfstack.com" ./* -R |grep -v "otocn\.sed"|awk -F':' '{print $1}' } check_not_change(){ - echo "=============================================> 以下可能的外部文件未被处理" + log_info "=============================================> 以下可能的外部文件未被处理" # 有些图标表情使用 CDN 的 SVG，这类也可以代理。TODO：有些svg中会包含地址，这类是不需要处理的，但是会grep出来。不移除会有大量的无效信息，还是不显示svg内容，根据实际情况单独处理 # raw.githubusercontent.com 是 github 的内容，太多输出了，有依赖单独处理吧 grep -iEo "(maxcdn.bootstrapcdn.com|code.jquery.com|cdnjs.cloudflare.com|cdn-images.mailchimp.com|cdn.jsdelivr.net|fonts.googleapis.com|unpkg.com|www.googletagmanager.com)" ./* -R |grep -vE "(\.sh\:|\.md\:|\.toml|index\.rss\.xml|README\.txt\:|otocn\.sed\:|\.svg\:|node_modules)" diff --git a/sed/cdn-images.mailchimp.com.sed b/sed/cdn-images.mailchimp.com.sed index 23396a2..e69de29 100644 --- a/sed/cdn-images.mailchimp.com.sed +++ b/sed/cdn-images.mailchimp.com.sed @@ -1 +0,0 @@ -s|https://cdn-images.mailchimp.com/|https://cdn.cncfstack.com/|g diff --git a/sed/cdn.jsdelivr.net.sed b/sed/cdn.jsdelivr.net.sed index 55772d7..7b12eae 100644 --- a/sed/cdn.jsdelivr.net.sed +++ b/sed/cdn.jsdelivr.net.sed @@ -21,7 +21,6 @@ s|https://cdn.jsdelivr.net/npm/@docsearch/css@3.8.2|https://cdn.cncfstack.com/np s|https://cdn.jsdelivr.net/npm/water.css@2/out/water.css|https://cdn.cncfstack.com/npm/water.css%402/out/water.css|g s|https://cdn.jsdelivr.net/gh/jshttp/mime-db@master/db.json|https://cdn.cncfstack.com/gh/jshttp/mime-db%40master/db.jso|g s|https://cdn.jsdelivr.net/npm/node-forge@1.0.0/dist/forge.min.js|https://cdn.cncfstack.com/npm/node-forge%401.0.0/dist/forge.min.js|g -s|https://cdn.jsdelivr.net/|https://cdn.cncfstack.com/|g s|https://cdn.jsdelivr.net/gh/jdecked/twemoji@15.1.0/assets/svg/1f386.svg|https://cdn.cncfstack.com/gh/jdecked/twemoji%4015.1.0/assets/svg/1f386.svg|g s|https://cdn.jsdelivr.net/gh/jdecked/twemoji@15.1.0/assets/svg/1f9d1-200d-1f91d-200d-1f9d1.svg|https://cdn.cncfstack.com/gh/jdecked/twemoji%4015.1.0/assets/svg/1f9d1-200d-1f91d-200d-1f9d1.svg|g s|https://cdn.jsdelivr.net/gh/jdecked/twemoji@15.1.0/assets/svg/1f4d6.svg|https://cdn.cncfstack.com/gh/jdecked/twemoji%4015.1.0/assets/svg/1f4d6.svg|g diff --git a/sed/cdnjs.cloudflare.com.sed b/sed/cdnjs.cloudflare.com.sed index 6db7a70..e8aeabc 100644 --- a/sed/cdnjs.cloudflare.com.sed +++ b/sed/cdnjs.cloudflare.com.sed @@ -1,2 +1 @@ -s|https://cdnjs.cloudflare.com/|https://cdn.cncfstack.com/|g s|https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css|https://cdn.cncfstack.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css| diff --git a/sed/code.jquery.com.sed b/sed/code.jquery.com.sed index dca8d02..e69de29 100644 --- a/sed/code.jquery.com.sed +++ b/sed/code.jquery.com.sed @@ -1 +0,0 @@ -s|https://code.jquery.com/|https://cdn.cncfstack.com/|g diff --git a/sed/maxcdn.bootstrapcdn.com.sed b/sed/maxcdn.bootstrapcdn.com.sed index 6bd8754..e69de29 100644 --- a/sed/maxcdn.bootstrapcdn.com.sed +++ b/sed/maxcdn.bootstrapcdn.com.sed @@ -1 +0,0 @@ -s|https://maxcdn.bootstrapcdn.com/|https://cdn.cncfstack.com/|g diff --git a/sed/unpkg.com.sed b/sed/unpkg.com.sed index 507a20a..466ebf4 100644 --- a/sed/unpkg.com.sed +++ b/sed/unpkg.com.sed @@ -16,5 +16,4 @@ s|https://unpkg.com/@popperjs/core@2/dist/umd/popper.js|https://cdn.cncfstack.co s|https://unpkg.com/@popperjs/core@2|https://cdn.cncfstack.com/%40popperjs/core%402|g s|https://unpkg.com/@popperjs/core@^2.0.0|https://cdn.cncfstack.com/%40popperjs/core%40^2.0.0|g s|https://unpkg.com/yargs-parser@19.0.0/browser.js|https://unpkg.com/yargs-parser%4019.0.0/browser.js|g -s|https://unpkg.com/|https://cdn.cncfstack.com/|g s|https://unpkg.com/lunr/lunr.js|https://cdn.cncfstack.com/lunr/lunr.js|g diff --git a/sed/www.google-analytics.com.sed b/sed/www.google-analytics.com.sed index dfe6216..e69de29 100644 --- a/sed/www.google-analytics.com.sed +++ b/sed/www.google-analytics.com.sed @@ -1 +0,0 @@ -s|https://www.google-analytics.com/|https://cdn.cncfstack.com/|g diff --git a/webs/litmuschaos/toto.sh b/webs/litmuschaos/toto.sh index 001abe4..0ae5c80 100644 --- a/webs/litmuschaos/toto.sh +++ b/webs/litmuschaos/toto.sh @@ -1,6 +1,8 @@ workdir=$1 initdir=$2 +set -x + source ${initdir}/libs/common.sh @@ -11,8 +13,10 @@ before_litmuschaos(){ #sed -i "s|plugins:\s*\[|plugins: [()=>({name:'umami-analytics',injectHtmlTags:()=>({headTags:[{tagName:'script',attributes:{defer:true,src:'https://umami.cncfstack.com/script.js','data-website-id':'e560133a-5a27-40ad-b816-9896199ffb01'}}]})}),|g" docusaurus.config.js - # 配置文件中没有plugins的配置，单独添加，选择一个常用的KEY - sed -i "s|themeConfig:\s*\{|plugins: [()=>({name:'umami-analytics',injectHtmlTags:()=>({headTags:[{tagName:'script',attributes:{defer:true,src:'https://umami.cncfstack.com/script.js','data-website-id':'e560133a-5a27-40ad-b816-9896199ffb01'}}]})}),],themeConfig: {|g" docusaurus.config.js + log_info "=============================================> 配置文件中没有plugins的配置，单独添加，选择一个常用的KEY" + sed -i "s|themeConfig:\s*\{|plugins: [()=>({name:'umami-analytics',injectHtmlTags:()=>({headTags:[{tagName:'script',attributes:{defer:true,src:'https://umami.cncfstack.com/script.js','data-website-id':'e560133a-5a27-40ad-b816-9896199ffb01'}}]})})],themeConfig: {|g" docusaurus.config.js + + log_info "=============================================> ./docusaurus.config.js 配置文件内容" cat ./docusaurus.config.js # plugins: [ # // ...其他插件... @@ -36,11 +40,10 @@ before_litmuschaos(){ after_litmuschaos(){ - log_info "开始 npm run build 构建" + log_info "=============================================> 开始 npm run build 构建" npm run build - - log_info "当前目录中文件列表" + log_info "=============================================> 当前目录中文件列表" ls -lh } @@ -55,7 +58,7 @@ cd $workdir if cat .git/config |grep '/litmuschaos/litmus-docs.git' ;then log_info "=============================================> 匹配到 chaos-mesh" before_litmuschaos - find_and_sed_v2 + find_and_sed_v2 "./website" after_litmuschaos save_return fi