diff --git a/settings/languages.ini b/settings/languages.ini index 1519674..81ea1d3 100644 --- a/settings/languages.ini +++ b/settings/languages.ini @@ -42,6 +42,18 @@ lang_en() { MODULE_FINNSH="Module installation completed" OUTPUT="Output" END="Installation end" + USER_ZIPPED="All modules have been zipped to" + USER_START_ZIP="Start zipping files" + USER_START_COPY_FILE="Start copying files" + USER_END_COPY_FILE="All files have been copied to" + USER_START_COMPRESS="Start compressing files" + USER_SUCCESSFULLY_COMPRESS="Successfully created archive" + USER_FAILED_COMPRESS="Failed to create archive for directory" + USER_KEY_BACKUPMODULE="Backup existing modules" + USER_NOT_BACKUPMODULE="Do not backup existing modules" + USER_CHOOSE_ZSTD="Next option suggested: choose zstd" + USER_PACK_MODULE_ZSTD="Pack module (Zstd) (slow)" + USER_PACK_MODULE="Pack module" } lang_zh() { ERROR_TEXT="错误" @@ -87,6 +99,18 @@ lang_zh() { MODULE_FINNSH="模块安装完成" OUTPUT="输出" END="安装结束" + USER_ZIPPED="所有模块已压缩到" + USER_START_ZIP="开始压缩文件" + USER_START_COPY_FILE="开始复制文件" + USER_END_COPY_FILE="所有文件已复制到" + USER_START_COMPRESS="开始压缩文件" + USER_SUCCESSFULLY_COMPRESS="成功创建压缩包" + USER_FAILED_COMPRESS="无法为目录创建压缩包" + USER_KEY_BACKUPMODULE="备份现有模块" + USER_NOT_BACKUPMODULE="不备份现有模块" + USER_CHOOSE_ZSTD="下一个建议选项:选择zstd" + USER_PACK_MODULE_ZSTD="打包模块(Zstd)(慢)" + USER_PACK_MODULE="打包模块" } lang_jp() { ERROR_TEXT="エラー" @@ -132,4 +156,16 @@ lang_jp() { MODULE_FINNSH="モジュールのインストールが完了しました" OUTPUT="出力" END="インストール終了" + USER_ZIPPED="すべてのモジュールが圧縮されました" + USER_START_ZIP="ファイルの圧縮を開始します" + USER_START_COPY_FILE="ファイルのコピーを開始します" + USER_END_COPY_FILE="すべてのファイルがコピーされました" + USER_START_COMPRESS="ファイルの圧縮を開始します" + USER_SUCCESSFULLY_COMPRESS="アーカイブの作成に成功しました" + USER_FAILED_COMPRESS="ディレクトリのアーカイブの作成に失敗しました" + USER_KEY_BACKUPMODULE="既存のモジュールをバックアップ" + USER_NOT_BACKUPMODULE="既存のモジュールをバックアップしない" + USER_CHOOSE_ZSTD="次のオプションを選択してください:zstd" + USER_PACK_MODULE_ZSTD="モジュールをパック(Zstd)(遅い)" + USER_PACK_MODULE="モジュールをパック" } \ No newline at end of file diff --git a/settings/script/User.sh b/settings/script/User.sh index e2cebd0..bfc1fdb 100644 --- a/settings/script/User.sh +++ b/settings/script/User.sh @@ -13,7 +13,7 @@ print_KEY_title() { echo "" echo "******************************************" echo " ${KEY_VOLUME}+$1" - echo " ${KEY_VOLUME}+$2" + echo " ${KEY_VOLUME}-$2" echo "******************************************" echo "" key_select @@ -22,9 +22,9 @@ zip_if() { if [ -f "$1" ]; then return_code="$1" if [ "$return_code" -eq 0 ]; then - echo "Successfully created archive: $2" + echo "${USER_SUCCESSFULLY_COMPRESS}: $2" else - abort "Failed to create archive for directory: $2" + abort "${USER_FAILED_COMPRESS}: $2" fi fi } @@ -60,26 +60,26 @@ main() { fi } main -print_KEY_title "备份现有模块" "不备份" +print_KEY_title "$USER_KEY_BACKUPMODULE" "$USER_NOT_BACKUPMODULE" if [ "$key_pressed" = "KEY_VOLUMEUP" ]; then - print_KEY_title "备份现有模块(Zip)" "备份现有模块(文件夹) (配合Zstd使用)" + print_KEY_title "$USER_KEY_BACKUPMODULE(Zip)" "$USER_KEY_BACKUPMODULE($USER_CHOOSE_ZSTD)" if [ "$key_pressed" = "KEY_VOLUMEUP" ]; then + echo "$USER_START_ZIP" for DIR in "/data/adb/modules/"*/; do DIR_NAME=$(basename "$DIR") - echo "Processing directory: $DIR_NAME" OUTPUT_FILE="$MODPATH/files/modules/${DIR_NAME}.zip" $zips a -r "$OUTPUT_FILE" "$DIR*" >/dev/null 2>&1 - zip_if "$?" "${DIR_NAME}.zip" done + echo "- $USER_ZIPPED $MODPATH/files/modules" else + echo "- $USER_START_COPY_FILE" cp -r "/data/adb/modules"/* "$MODPATH/files/modules" >/dev/null 2>&1 - echo "All files have been copied to $MODPATH/files/modules" + echo "- $USER_END_COPY_FILE $MODPATH/files/modules" fi -else - echo 1 fi -print_KEY_title "打包模块(Zstd)(慢)" "打包模块" +print_KEY_title "$USER_PACK_MODULE_ZSTD" "$USER_PACK_MODULE" if [ "$key_pressed" = "KEY_VOLUMEUP" ]; then + echo "- $USER_START_COMPRESS" tar -cf "$MODPATH/output.tar" -C "$MODPATH" files/ zip_if "$?" "output.tar" $zstd -ultra -22 "$MODPATH/output.tar.zst" "$MODPATH/output.tar" >/dev/null 2>&1 @@ -98,4 +98,4 @@ fi rm -rf /data/local/tmp/settings/ rm -rf /data/local/tmp/prebuilts.tar.xz rm -rf /data/local/tmp/prebuilts/ -exit 0 \ No newline at end of file +exit 0