From dc29daf493ec4d6baa44a83ea3349e79ddc4ec7e Mon Sep 17 00:00:00 2001 From: Arondight Date: Mon, 29 Feb 2016 22:04:55 +0800 Subject: [PATCH] =?UTF-8?q?v1.03=20=E9=A1=B9=E7=9B=AE=E7=A7=BB=E4=BA=A4sla?= =?UTF-8?q?ckwarecn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Changes | 3 +++ README.md | 21 ++++++++++++++++----- TODO | 2 ++ bin/slacklib32.sh | 13 +++++++------ install.sh | 15 ++++++++------- lib/check_environment.sh | 20 ++++++++++---------- lib/get_arch.sh | 20 ++++++++++---------- lib/install_multilib.sh | 18 +++++++++--------- lib/main_window.sh | 20 ++++++++++---------- 9 files changed, 75 insertions(+), 57 deletions(-) create mode 100644 TODO diff --git a/Changes b/Changes index 3f937da..0f9eee3 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,6 @@ +v1.03 2016-02-29 + * 项目移交slackwarecn 维护 + v1.02 2015-08-07 * 更改了一处执行流程。 diff --git a/README.md b/README.md index 9baa0f4..05531bb 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,30 @@ -#关于 +# 关于 + 项目用于在Slackware64 上安装32 位运行库。 程序会自动检测Slackware 版本，您也可以手动指定版本。然而程序无法分辨Current 版本，请手动选择Current。 如果BUG 请提交[Issues][id_Issues]。 -[id_Issues]: https://github.com/Arondight/slacklib32/issues "点此提交问题" +[id_Issues]: https://github.com/slackwarecn/slacklib32/issues "点此提交问题" + +# 安装 -#安装 ``` -git clone https://github.com/Arondight/slacklib32.git /tmp/slacklib32 +git clone https://github.com/Slackwarecn/slacklib32.git /tmp/slacklib32 cd /tmp/slacklib32 && sudo ./install.sh sudo slacklib32 ``` -#截图 +# 版权 + +Copyright (C) 2016 The Slackware Linux CN Community + +# 协议 + +[点此](LICENSE)查看协议。 + +# 截图 + ![截图1](screenshots/screenshot1.png?raw=true) diff --git a/TODO b/TODO new file mode 100644 index 0000000..7c8da81 --- /dev/null +++ b/TODO @@ -0,0 +1,2 @@ +1. 添加多语言支持 + diff --git a/bin/slacklib32.sh b/bin/slacklib32.sh index 1bc8ede..dcbdf89 100755 --- a/bin/slacklib32.sh +++ b/bin/slacklib32.sh @@ -1,10 +1,11 @@ #!/usr/bin/env bash -# ===================================================== # -# 如有BUG 请提交Issues # -# https://github.com/Arondight/slacklib32/issues # -# # -# Copyright (C) 2014-2015 秦凡东 # -# ===================================================== # +# ============================================================================== +# 如有BUG 请提交Issues +# https://github.com/slackwarecn/slacklib32/issues +# +# Copyright (C) 2014-2015 秦凡东 +# Copyright (C) 2016 The Slackware Linux CN Community +# ============================================================================== source /usr/local/lib/check_environment.sh source /usr/local/lib/main_window.sh diff --git a/install.sh b/install.sh index 7350db2..ca6a462 100755 --- a/install.sh +++ b/install.sh @@ -1,10 +1,11 @@ #!/usr/bin/env bash -# ===================================================== # -# 如有BUG 请提交Issues # -# https://github.com/Arondight/slacklib32/issues # -# # -# Copyright (C) 2014-2015 秦凡东 # -# ===================================================== # +# ============================================================================== +# 如有BUG 请提交Issues +# https://github.com/slackwarecn/slacklib32/issues +# +# Copyright (C) 2014-2015 秦凡东 +# Copyright (C) 2016 The Slackware Linux CN Community +# ============================================================================== cwd=$(dirname $(readlink -f $0)) exec_target='/usr/local/bin/slacklib32' @@ -48,7 +49,7 @@ done # now answer is yes for lib_file in ${lib_files[@]}; do - cp -f "$lib_file" "$lib_target" + install -m755 "$lib_file" "$lib_target" done if [[ 0 -eq $? ]]; then diff --git a/lib/check_environment.sh b/lib/check_environment.sh index e4fd8d1..e576754 100644 --- a/lib/check_environment.sh +++ b/lib/check_environment.sh @@ -1,15 +1,15 @@ -# ===================================================== # -# 如有BUG 请提交Issues # -# https://github.com/Arondight/slacklib32/issues # -# # -# Copyright (C) 2014-2015 秦凡东 # -# ===================================================== # +# ============================================================================== +# 如有BUG 请提交Issues +# https://github.com/slackwarecn/slacklib32/issues +# +# Copyright (C) 2014-2015 秦凡东 +# Copyright (C) 2016 The Slackware Linux CN Community +# ============================================================================== -# ========================= +# ============================================================================== # check_environment -# 检查脚本依赖环境是否满足 -# 结果直接用return 语句返回 -# ========================= +# 检查脚本依赖环境是否满足，结果直接用return 语句返回 +# ============================================================================== function check_environment { local use_dialog local title='slacklib32' diff --git a/lib/get_arch.sh b/lib/get_arch.sh index 6146e6a..8e11c75 100644 --- a/lib/get_arch.sh +++ b/lib/get_arch.sh @@ -1,15 +1,15 @@ -# ===================================================== # -# 如有BUG 请提交Issues # -# https://github.com/Arondight/slacklib32/issues # -# # -# Copyright (C) 2014-2015 秦凡东 # -# ===================================================== # +# ============================================================================== +# 如有BUG 请提交Issues +# https://github.com/slackwarecn/slacklib32/issues +# +# Copyright (C) 2014-2015 秦凡东 +# Copyright (C) 2015 The Slackware Linux CN Community +# ============================================================================== -# ========================= +# ============================================================================== # get_arch -# 获得机器的架构 -# 结果存入$arch_file -# ========================= +# 获得机器的架构，结果存入$arch_file +# ============================================================================== function get_arch () { local arch local use_dialog diff --git a/lib/install_multilib.sh b/lib/install_multilib.sh index 4ae7f59..bd8c08e 100644 --- a/lib/install_multilib.sh +++ b/lib/install_multilib.sh @@ -1,14 +1,14 @@ -# ===================================================== # -# 如有BUG 请提交Issues # -# https://github.com/Arondight/slacklib32/issues # -# # -# Copyright (C) 2014-2015 秦凡东 # -# ===================================================== # +# ============================================================================== +# 如有BUG 请提交Issues +# https://github.com/slackwarecn/slacklib32/issues +# +# Copyright (C) 2014-2015 秦凡东 +# Copyright (C) 2016 The Slackware Linux CN Community +# ============================================================================== -# ========================= +# ============================================================================== # install_multilib -# 下载并安装Multilib -# 结果以return 语句返回 +# 下载并安装Multilib，结果以return 语句返回 # ========================= function install_multilib () { local use_dialog diff --git a/lib/main_window.sh b/lib/main_window.sh index 1be7c08..285a428 100644 --- a/lib/main_window.sh +++ b/lib/main_window.sh @@ -1,15 +1,15 @@ -# ===================================================== # -# 如有BUG 请提交Issues # -# https://github.com/Arondight/slacklib32/issues # -# # -# Copyright (C) 2014-2015 秦凡东 # -# ===================================================== # +# ============================================================================== +# 如有BUG 请提交Issues +# https://github.com/slackwarecn/slacklib32/issues +# +# Copyright (C) 2014-2015 秦凡东 +# Copyright (C) 2016 The Slackware Linux CN Community +# ============================================================================== -# ========================= +# ============================================================================== # main_window -# 绘制主界面 -# 版本号存入$version_file -# ========================= +# 绘制主界面，版本号存入$version_file +# ============================================================================== function main_window () { local my_version local result