diff --git a/prebuilds/usr/local/sbin/download_pkg b/prebuilds/usr/local/sbin/download_pkg index 3d41a0d..44f61e0 100755 --- a/prebuilds/usr/local/sbin/download_pkg +++ b/prebuilds/usr/local/sbin/download_pkg @@ -2,7 +2,7 @@ # Ver: 1.2 by Endial Fang (endial@126.com) # # shell 执行参数,分别为 -e(命令执行错误则退出脚本) -u(变量未定义则报错) -x(打印实际待执行的命令行) -set -eux +set -eu # 定义错误处理函数,添加错误位置信息 error() { @@ -123,7 +123,7 @@ if [ -e "$cache_root/$package" ]; then echo "Package already exists in cache: $cache_root/$package" else cd $install_root - echo "Downloading $package package" + echo "Downloading $package package..." for url in $package_urls; do echo "Try $url/$package" if wget -T 10 -O "$cache_root/$package" "$url/$package" && [ -s "$cache_root/$package" ]; then diff --git a/prebuilds/usr/local/sbin/install_pkg b/prebuilds/usr/local/sbin/install_pkg index 46f7bee..fbd92a0 100755 --- a/prebuilds/usr/local/sbin/install_pkg +++ b/prebuilds/usr/local/sbin/install_pkg @@ -2,7 +2,7 @@ # Ver: 1.2 by Endial Fang (endial@126.com) # # shell 执行参数,分别为 -e(命令执行错误则退出脚本) -u(变量未定义则报错) -x(打印实际待执行的命令行) -set -eux +set -eu # 检查用户权限 if [ "$EUID" -ne 0 ]; then @@ -48,6 +48,7 @@ export DEBIAN_FRONTEND=noninteractive && until [ $retry -gt $max ]; do set +e ( + echo "Update and install packages..." && apt-get update && apt-get install -y --no-install-recommends $* ) diff --git a/prebuilds/usr/local/sbin/select_source b/prebuilds/usr/local/sbin/select_source index 448aa20..7389789 100755 --- a/prebuilds/usr/local/sbin/select_source +++ b/prebuilds/usr/local/sbin/select_source @@ -3,7 +3,7 @@ # # 此脚本用于根据传入的参数选择对应的 apt 源配置文件并复制到指定目录 # shell 执行参数,分别为 -e(命令执行错误则退出脚本) -u(变量未定义则报错) -x(打印实际待执行的命令行) -set -eux +set -eu # 检查是否有足够的权限 if [ "$EUID" -ne 0 ]; then