新的二进制文件

其他修改直接看git版本比较吧

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: 构建二进制可执行文件
+name: 更新二进制可执行文件
 
 on:
   workflow_dispatch:
@@ -11,30 +11,45 @@ jobs:
 
   build:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - target: x86_64-linux-musl
-            artifact: language
-          - target: aarch64-linux-musl
-            artifact: language_arm
     steps:
-      - uses: actions/checkout@v6
-      - name: 下载 musl 工具链
-        uses: lmq8267/dl-musl@main
-        with:
-          target: ${{ matrix.target }}
-          static: true
-
-      - name: 编译
+      - uses: actions/checkout@v4
+      - name: 安装GCC对ARM交叉编译工具链
+        run: sudo apt install g++-aarch64-linux-gnu
+        
+      - name: 编译源代码
         run: |
-          if [ "${{ matrix.target }}" = "x86_64-linux-musl" ]; then
-            "$CXX" -o "${{ matrix.artifact }}" -std=c++23 -s --static language.cpp
-          else
-            "$CXX" -o "${{ matrix.artifact }}" -std=c++23 -s --static language.cpp
-          fi
+            g++ -o language --static -std=c++20 language.cpp
+            aarch64-linux-gnu-g++ -o language_arm --static -std=c++20 language.cpp
+          # 静态链接，避免运行时才发现缺少so动态链接库
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v4
+        with: 
+          name: language_arm
+          path: language_arm
+      - uses: actions/upload-artifact@v4
+        with: 
+          name: language
+          path: language
+  push:
+    needs: build
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      # 更新仓库需要写入权限
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
         with:
-          name: ${{ matrix.artifact }}
-          path: ${{ matrix.artifact }}
+          name: language
+      - uses: actions/download-artifact@v4
+        with:
+          name: language_arm
+
+      - name: 推送
+        run: |
+              git config --global user.email "gaojian520one@outlook.com"
+              git config --global user.name "TheWhiteDog9487"
+              git add .
+              git commit -m "新的二进制文件"
+              git push

.gitignore

@@ -2,7 +2,5 @@
 # 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。
 ################################################################################
 
-.vs
-.vscode
-a.out
-build
+/.vs
+/.vscode

README.md

@@ -3,8 +3,8 @@
 ### **x86_64：**
 |系统名称|版本|
 |-|-|
-|Debian|13.2 <br/> 11.6|
-|Ubuntu|26.04 LTS <br/> 25.04 <br/> 24.10 <br/> 24.04.1 LTS <br/> 22.04 LTS <br/> 20.04 LTS|
+|Debian|11.6.0|
+|Ubuntu|25.04 / 24.10 / 24.04.1 LTS / 22.04 LTS / 20.04 LTS|
 
 ### **aarch64：**
 |系统名称|版本|
@@ -14,21 +14,15 @@
 ## 使用方法
 ### **x86_64：**
 ```shell
-sudo -E su
-# 如果是WSL环境必须使用-E参数保留环境变量，否则权限提升之后WSL_DISTRO_NAME会消失
-# 如果不是WSL，可以不加这个参数，只提权就好
 apt update && apt install -y wget
-wget https://github.com/TheWhiteDog9487/ubuntu-language-onekey-zh_cn/releases/latest/download/language
-chmod +x language
-./language
+wget https://raw.githubusercontent.com/TheWhiteDog9487/ubuntu-language-onekey-zh_cn/main/language
+sudo chmod u+x language
+sudo ./language
 ```
 ### **aarch64：**
 ```shell
-sudo -E su
-# 如果是WSL环境必须使用-E参数保留环境变量，否则权限提升之后WSL_DISTRO_NAME会消失
-# 如果不是WSL，可以不加这个参数，只提权就好
 apt update && apt install -y wget
-wget https://github.com/TheWhiteDog9487/ubuntu-language-onekey-zh_cn/releases/latest/download/language_arm
-chmod +x language_arm
-./language_arm
+wget https://raw.githubusercontent.com/TheWhiteDog9487/ubuntu-language-onekey-zh_cn/main/language_arm
+sudo chmod u+x language_arm
+sudo ./language_arm
 ```

language.cpp

@@ -3,35 +3,39 @@
 #include <string>
 #include <fstream>
 #include <filesystem>
-#include <ciso646>
 
 #ifdef __linux__
-    #include <unistd.h>
+#include <unistd.h>
 #endif
 
 using namespace std;
 
+auto LOCALE = R"(
+LANG="zh_CN.UTF-8"
+LANGUAGE="zh_CN:zh:en_US:en"
+LC_NUMERIC="zh_CN.UTF-8"
+LC_TIME="zh_CN.UTF-8"
+LC_MONETARY="zh_CN.UTF-8"
+LC_PAPER="zh_CN.UTF-8"
+LC_IDENTIFICATION="zh_CN.UTF-8"
+LC_NAME="zh_CN.UTF-8"
+LC_ADDRESS="zh_CN.UTF-8"
+LC_TELEPHONE="zh_CN.UTF-8"
+LC_MEASUREMENT="zh_CN.UTF-8"
+LC_ALL="zh_CN.UTF-8"
+)"s;
+
 enum class System{
     WSL,
+    Windows,
     Linux,
     Unsupported };
-enum class WslDistro{
-    Ubuntu,
-    Debian,
-    Unsupported,
-    IsNotWsl };
 enum class User{
     Root,
     Other };
 
 auto GetCurrentSystemType(){
-    #pragma warning(suppress : 4996)
-    if (getenv("WSL_DISTRO_NAME") != nullptr){
-        return System::WSL; }
-    #pragma warning(suppress : 4996)
-    if (getenv("WSL_INTEROP") != nullptr){
-        return System::WSL; }
-    if (filesystem::exists("/proc/version")) {
+        if (filesystem::exists("/proc/version")) {
         ifstream version_file("/proc/version");
         string version_info = "";
         getline(version_file, version_info);
@@ -43,30 +47,24 @@ auto GetCurrentSystemType(){
         ifstream osrelease_file("/proc/sys/kernel/osrelease");
         string osrelease_info = "";
         getline(osrelease_file, osrelease_info);
-        if (osrelease_info.find("microsoft") != string::npos or
+        if (osrelease_info.find("Microsoft") != string::npos or
             osrelease_info.find("WSL") != string::npos) {
             return System::WSL; }
         osrelease_file.close(); }
-
-    #ifdef __linux__
-        return System::Linux;
-    #else
-        return System::Unsupported;
-    #endif
-}
-
-auto GetCurrentWslDistro(){
     #pragma warning(suppress : 4996)
     if (getenv("WSL_DISTRO_NAME") != nullptr){
-        string DistroName = getenv("WSL_DISTRO_NAME");
-        if (DistroName.find("Ubuntu") != string::npos){
-            return WslDistro::Ubuntu; }
-        else if (DistroName.find("Debian") != string::npos){
-            return WslDistro::Debian; }
-        else{
-            return WslDistro::Unsupported; } }
+        return System::WSL; }
+    #pragma warning(suppress : 4996)
+    if (getenv("WSL_INTEROP") != nullptr){
+        return System::WSL; }
+    #pragma warning(suppress : 4996)
+    if (getenv("OS") != nullptr){
+        return System::Windows;}
+    #pragma warning(suppress : 4996)
+    else if (getenv("HOME") != nullptr){
+        return System::Linux;}
     else{
-        return WslDistro::IsNotWsl; } }
+        return System::Unsupported;} }
 
 auto GetCurrentUser(){
     #pragma warning(suppress : 4996)
@@ -92,9 +90,9 @@ auto GetCurrentSystem() {
                 distro_name = line.substr(line.find("=") + 1);
                 distro_name.erase(0, 1); // remove opening quote
                 distro_name.erase(distro_name.size() - 1); // remove closing quote
-                break;} }
-        release_file.close(); }
-    return distro_name; }
+                break;}}
+        release_file.close();}
+    return distro_name;}
 
 auto check() {
     cout << "请输入您的选项（输入y或者yes继续）";
@@ -104,79 +102,90 @@ auto check() {
         return;
     else{
         cout << "输入不正确欸，如果想停止本程序的话请按下Ctrl+C" << endl;
-        check(); } }
+        check();}}
 
-auto RebootIfIsWSL(){
-    if (GetCurrentSystemType() == System::WSL){
-        system("wsl.exe --terminate $WSL_DISTRO_NAME"); } }
+auto WSL(){
+    cout << "开始更新语言配置" << endl;
+    system("update-locale LANG=zh_CN.UTF-8");
+    cout << "语言配置更新完成" << endl;
+    cout << "更新语言配置需要重启WSL，要现在重启吗？" << endl;
+    check();
+    system("cmd.exe /c \"wsl --shutdown\""); }
 
 auto Ubuntu(){
     cout << "即将开始安装并配置简体中文语言包，请输入y或者yes继续，或者按Ctrl+C终止本程序";
     check();
-    cout << "开始更新语言配置" << endl;
-    system("apt update");
     system("apt install -y language-pack-zh-hans");
-    system("update-locale LANG=zh_CN.UTF-8");
-    cout << "语言配置更新完成" << endl;
+    system("locale-gen zh_CN.UTF-8");
+    if ( filesystem::exists("/etc/locale.conf") ){
+        filesystem::copy_file("/etc/locale.conf", "/etc/locale.conf.backup", filesystem::copy_options::overwrite_existing);
+        fstream locale_conf("/etc/locale.conf", ios::out bitor ios::trunc);
+        locale_conf << LOCALE << endl;
+        locale_conf.close();
+        filesystem::permissions("/etc/locale.conf", filesystem::perms::owner_read bitor filesystem::perms::owner_write bitor filesystem::perms::group_read bitor filesystem::perms::others_read);
+        cout << "原/etc/locale.conf已经备份为/etc/locale.conf.backup" << endl;}
+    else if ( filesystem::exists("/etc/default/locale") ){
+        filesystem::copy_file("/etc/default/locale", "/etc/default/locale.backup", filesystem::copy_options::overwrite_existing);
+        fstream locale("/etc/default/locale", ios::out bitor ios::trunc);
+        locale << LOCALE << endl;
+        locale.close();
+        filesystem::permissions("/etc/default/locale", filesystem::perms::owner_read bitor filesystem::perms::owner_write bitor filesystem::perms::group_read bitor filesystem::perms::others_read);
+        cout << "原/etc/default/locale已经备份为/etc/default/locale.backup" << endl;}
     cout << "即将重启以应用语言设置，请保存您未完成的工作以防数据丢失" << endl;
     cout << "输入y或者yes重启或者按Ctrl+C终止本程序" << endl;
     check();
-    RebootIfIsWSL();
-    system("reboot"); }
-
-auto Debian(){
-    cout << "即将开始更新语言配置，请输入y或者yes继续，或者按Ctrl+C终止本程序";
-    check();
-    cout << "开始更新语言配置" << endl;
-    fstream locale_gen("/etc/locale.gen", ios::app);
-    locale_gen << '\n' <<
-        "zh_CN.UTF-8 UTF-8" << endl;
-    locale_gen.close();
-    system("locale-gen");
-    system("update-locale LANG=zh_CN.UTF-8");
-    cout << "即将重启以应用语言设置，请保存您未完成的工作以防数据丢失" << endl;
-    cout << "输入y或者yes重启或者按Ctrl+C终止本程序" << endl;
-    check();
-    RebootIfIsWSL();
     system("reboot");}
 
-auto OsType = GetCurrentSystemType();
+auto Debian(){
+    filesystem::copy_file("/etc/locale.gen", "/etc/locale.gen.backup", filesystem::copy_options::overwrite_existing);
+    fstream locale_gen("/etc/locale.gen", ios::out bitor ios::trunc);
+    locale_gen << "zh_CN.UTF-8 UTF-8" << endl;
+    locale_gen.close();
+    system("locale-gen");
+    filesystem::permissions("/etc/locale.gen", filesystem::perms::owner_read bitor filesystem::perms::owner_write bitor filesystem::perms::group_read bitor filesystem::perms::others_read);
+    if ( filesystem::exists("/etc/default/locale") ){
+        filesystem::copy_file("/etc/default/locale", "/etc/default/locale.backup", filesystem::copy_options::overwrite_existing);
+        fstream locale("/etc/default/locale", ios::out bitor ios::trunc);
+        locale << LOCALE << endl;
+        locale.close();
+        filesystem::permissions("/etc/default/locale", filesystem::perms::owner_read bitor filesystem::perms::owner_write bitor filesystem::perms::group_read bitor filesystem::perms::others_read);
+        cout << "原/etc/default/locale已经备份为/etc/default/locale.backup" << endl;}
+    cout << "原/etc/locale.gen已经备份为/etc/locale.gen.backup" << endl;
+    cout << "即将重启以应用语言设置，请保存您未完成的工作以防数据丢失" << endl;
+    cout << "输入y或者yes重启或者按Ctrl+C终止本程序" << endl;
+    check();
+    system("reboot");}
 
 int main() {
-    if (OsType == System::Unsupported){
-        cout << "未知操作系统，为确保数据安全将会强制退出。"
-            << endl 
-            << "如果是误报，请联系作者修复问题。"
-            << endl;
+    auto OSType = GetCurrentSystemType();
+	if (OSType == System::Windows){
+		cout << "Windows请在“设置”应用中调整语言(❁´◡`❁)。" << endl;
         throw runtime_error("不支持的操作系统"); }
-
-    auto OS = GetCurrentSystem();
-    auto Distro = GetCurrentWslDistro();
-    auto CurrentUser = GetCurrentUser();
-
-    if (CurrentUser == User::Other){
-        cout << "更改语言文件需要root权限，请使用sudo重新运行本程序" << endl;
-        throw runtime_error("权限不足"); }
-
-    if (OsType == System::WSL) {
+    else if (OSType == System::WSL) {
+        auto OS = GetCurrentSystem();
         cout << "检测到您使用的系统为：" << OS << endl;
         cout << "并且该系统工作于WSL环境" << endl;
-        if (Distro == WslDistro::IsNotWsl){
-            throw runtime_error("无法获取WSL发行版信息"); }
-
-        if (Distro == WslDistro::Ubuntu){ Ubuntu(); }
-        else if (Distro == WslDistro::Debian){ Debian(); }
+        auto CurrentUser = GetCurrentUser();
+        if (CurrentUser == User::Root){
+            WSL(); }
         else{
-            cout << endl
-                << "错误：当前仅适配了Ubuntu和Debian" << endl
-                << "强行使用可能会造成不可预知的问题" << endl
-                << "为避免出现故障，程序会强制退出" << endl;
-            throw runtime_error("不支持的发行版"); } }
-
-    else if (OsType == System::Linux) {
+            cout << "更改语言配置需要root权限，请使用sudo重新运行本程序" << endl;
+            throw runtime_error("权限不足"); } }
+    else if (OSType == System::Linux) {
+        auto OS = GetCurrentSystem();
         cout << "检测到您使用的系统为：" << OS << endl;
+        auto CurrentUser = GetCurrentUser();
+        if (CurrentUser == User::Other){
+            cout << "更改语言文件需要root权限，请使用sudo重新运行本程序" << endl;
+            throw runtime_error("权限不足"); }
         if (OS.find("Ubuntu") != string::npos){
             Ubuntu(); }
         if (OS.find("Debian") != string::npos or
             OS.find("Armbian") != string::npos){
-            Debian(); } } }
+            Debian(); } }
+    else if (OSType == System::Unsupported){
+        cout << "未知操作系统，为确保数据安全将会强制退出。"
+            << endl 
+            << "如果是误报，请联系作者修复问题。"
+            << endl;
+        throw runtime_error("不支持的操作系统"); } }