From 18dd20fac787297e766f91d803c32bd2a520a3c2 Mon Sep 17 00:00:00 2001 From: shy Date: Mon, 18 Mar 2024 21:25:12 +0800 Subject: [PATCH] add some --- etc/miss.sh | 13 ++++--------- etc/zh-cn.js | 1 - src/main.go | 10 +--------- src/main.sh | 20 +++----------------- src/template/web.code.autogen/miss.sh | 6 +----- 5 files changed, 9 insertions(+), 41 deletions(-) delete mode 120000 etc/zh-cn.js diff --git a/etc/miss.sh b/etc/miss.sh index 0886590a..65c75b0b 100644 --- a/etc/miss.sh +++ b/etc/miss.sh @@ -10,16 +10,11 @@ ish_miss_prepare_develop ish_miss_prepare_project ish_miss_prepare_contexts -ish_miss_prepare_intshell -ish_miss_prepare_learning -ish_miss_prepare_volcanos -ish_miss_prepare_toolkits -ish_miss_prepare_icebergs +ish_miss_prepare_resource + ish_miss_prepare_release -ish_miss_prepare_modules -ish_miss_prepare program -ish_miss_prepare geoarea -ish_miss_prepare icons +ish_miss_prepare_icebergs +ish_miss_prepare_toolkits ish_miss_prepare go-git ish_miss_prepare go-qrcode diff --git a/etc/zh-cn.js b/etc/zh-cn.js deleted file mode 120000 index f288589c..00000000 --- a/etc/zh-cn.js +++ /dev/null @@ -1 +0,0 @@ -../src/template/web.chat.header/language/zh-cn.js \ No newline at end of file diff --git a/src/main.go b/src/main.go index 063e97d7..e672650c 100644 --- a/src/main.go +++ b/src/main.go @@ -2,15 +2,7 @@ package main import ( "shylinux.com/x/ice" - _ "shylinux.com/x/icebergs/base/aaa/portal" - _ "shylinux.com/x/icebergs/core/chat/oauth" - _ "shylinux.com/x/icebergs/misc/java" - _ "shylinux.com/x/icebergs/misc/node" - _ "shylinux.com/x/icebergs/misc/wx" - - _ "shylinux.com/x/icebergs/misc/chrome" - _ "shylinux.com/x/icebergs/misc/coder" - _ "shylinux.com/x/icebergs/misc/disk" + _ "shylinux.com/x/ice/devops" ) func main() { print(ice.Run()) } diff --git a/src/main.sh b/src/main.sh index f8f04bac..b3057bf1 100644 --- a/src/main.sh +++ b/src/main.sh @@ -1,20 +1,5 @@ #!/bin/sh -prepare_package() { - case "$(uname)" in - Darwin) xcode-select --install 2>/dev/null ;; - Linux) if [ `whoami` != "root" ]; then return; fi - if cat /etc/os-release|grep alpine &>/dev/null; then - sed -i 's/dl-cdn.alpinelinux.org/mirrors.tencent.com/g' /etc/apk/repositories && apk update - TZ=Asia/Shanghai; apk add tzdata && cp /usr/share/zoneinfo/${TZ} /etc/localtime && echo ${TZ} > /etc/timezone - return - fi - if cat /etc/os-release|grep "CentOS-8"&>/dev/null; then - minorver=8.5.2111; sed -e "s|^mirrorlist=|#mirrorlist=|g" -e "s|^#baseurl=http://mirror.centos.org/\$contentdir/\$releasever|baseurl=https://mirrors.aliyun.com/centos-vault/$minorver|g" -i.bak /etc/yum.repos.d/CentOS-*.repo && yum update -y - fi - ;; - esac -} main() { case "$1" in app) shift # 生产环境 @@ -23,9 +8,10 @@ main() { prepare_ice && $PWD/bin/ice.bin forever start "$@" ;; dev) shift # 开发环境 - require miss.sh; prepare_package; prepare_system; [ -f ~/.gitconfig ] || ish_dev_git_prepare + require miss.sh; ish_miss_prepare_package; prepare_system; [ -f ~/.gitconfig ] || ish_dev_git_prepare if ! [ -e $ctx_name ]; then - git config --global "url.$ctx_dev/x/.insteadof" "${ctx_repos%/*}/" && echo && ish_log_debug -g "clone $ctx_repos" && git clone $ctx_repos $ctx_name + git config --global "url.$ctx_dev/x/.insteadof" "${ctx_repos%/*}/" + echo && ish_log_debug -g "clone $ctx_repos" && git clone $ctx_repos $ctx_name fi; cd $ctx_name source etc/miss.sh && $PWD/bin/ice.bin forever start "$@" ;; diff --git a/src/template/web.code.autogen/miss.sh b/src/template/web.code.autogen/miss.sh index b261ad6e..7ee82866 100644 --- a/src/template/web.code.autogen/miss.sh +++ b/src/template/web.code.autogen/miss.sh @@ -10,10 +10,6 @@ ish_miss_prepare_develop ish_miss_prepare_project ish_miss_prepare_contexts -ish_miss_prepare_intshell -ish_miss_prepare_learning -ish_miss_prepare_volcanos -ish_miss_prepare_modules -ish_miss_prepare icons +ish_miss_prepare_resource ish_miss_make; [ -z "$*" ] || ish_miss_serve "$@"