From c283e39b22d8b859e96f23f285959465b6e06ff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 21 Feb 2023 20:44:22 +0800 Subject: [PATCH 1/5] CI: update artifact name (Win32) --- .github/workflows/push.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index f1bbf2b83..027f7ff1d 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -276,13 +276,13 @@ jobs: run: ctest - name: create zip archive - run: zip fastfetch-$(./fastfetch --version-raw)-win32.zip *.dll fastfetch.exe flashfetch.exe + run: zip fastfetch-$(./fastfetch --version-raw)-Win32.zip *.dll fastfetch.exe flashfetch.exe - name: upload artifacts uses: actions/upload-artifact@v3 with: - name: fastfetch-win32 - path: ./fastfetch-*-win32.zip + name: fastfetch-Win32 + path: ./fastfetch-*-Win32.zip release: if: github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'LinusDierheimer/fastfetch' From 3e068d16df2ae5deaf3de604f85acaea436d25ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 21 Feb 2023 21:25:02 +0800 Subject: [PATCH 2/5] Wifi / Battery (Android): more accurate checks --- src/detection/battery/battery_android.c | 4 ++-- src/detection/wifi/wifi_android.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/detection/battery/battery_android.c b/src/detection/battery/battery_android.c index fe081e85b..c80e5cf6b 100644 --- a/src/detection/battery/battery_android.c +++ b/src/detection/battery/battery_android.c @@ -18,8 +18,8 @@ const char* ffDetectBatteryImpl(FF_MAYBE_UNUSED FFinstance* instance, FFlist* re })) return "Starting `" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` failed"; - if(buffer.length == 0) - return "`" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` prints empty"; + if(buffer.chars[0] != '{') + return "`" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` prints invalid result (not a JSON object)"; BatteryResult* battery = ffListAdd(results); battery->temperature = FF_BATTERY_TEMP_UNSET; diff --git a/src/detection/wifi/wifi_android.c b/src/detection/wifi/wifi_android.c index 5a304de4c..e7278407e 100644 --- a/src/detection/wifi/wifi_android.c +++ b/src/detection/wifi/wifi_android.c @@ -13,12 +13,12 @@ const char* ffDetectWifi(FF_MAYBE_UNUSED const FFinstance* instance, FFlist* res if(ffProcessAppendStdOut(&buffer, (char* const[]){ FF_TERMUX_API_PATH, - "WifiConnectionInfo" + FF_TERMUX_API_PARAM })) return "Starting `" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` failed"; - if(buffer.length == 0) - return "`" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` prints empty"; + if(buffer.chars[0] != '{') + return "`" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` prints invalid result (not a JSON object)"; FFWifiResult* item = (FFWifiResult*)ffListAdd(result); ffStrbufInit(&item->inf.description); From 30d1a55dde52d899a4af4a003982711d05f16748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 21 Feb 2023 21:28:26 +0800 Subject: [PATCH 3/5] Release: 1.10.1 --- CHANGELOG.md | 4 ++++ CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 425678945..8dcb35548 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 1.10.1 + +New release for debugging #421 + # 1.10.0 Notable Changes: diff --git a/CMakeLists.txt b/CMakeLists.txt index 6cd942949..2eb20bc4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.12.0) # target_link_libraries with OBJECT libs & project homepage url project(fastfetch - VERSION 1.10.0 + VERSION 1.10.1 LANGUAGES C DESCRIPTION "Fast system information tool" HOMEPAGE_URL "https://github.com/LinusDierheimer/fastfetch" From 28baf2596e342d04ca360e1a0ec005991eae8d2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 21 Feb 2023 21:38:10 +0800 Subject: [PATCH 4/5] CMake: more debug info --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2eb20bc4b..1888ee2d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -161,6 +161,8 @@ if(NOT TARGET_DIR_ETC) set(TARGET_DIR_ETC "${TARGET_DIR_ROOT}/etc") endif() +message(STATUS "Target dirs: ROOT=\"${TARGET_DIR_ROOT}\" USR=\"${TARGET_DIR_USR}\" ETC=\"${TARGET_DIR_ETC}\"") + #https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT.html if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) set(CMAKE_INSTALL_PREFIX "${TARGET_DIR_USR}" CACHE PATH "..." FORCE) From 3a7d7d79c0a6bd65243709f39544ad533adca458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 21 Feb 2023 21:40:55 +0800 Subject: [PATCH 5/5] CMake: more debug info --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1888ee2d9..bda2635cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -161,7 +161,7 @@ if(NOT TARGET_DIR_ETC) set(TARGET_DIR_ETC "${TARGET_DIR_ROOT}/etc") endif() -message(STATUS "Target dirs: ROOT=\"${TARGET_DIR_ROOT}\" USR=\"${TARGET_DIR_USR}\" ETC=\"${TARGET_DIR_ETC}\"") +message(STATUS "Target dirs: ROOT=\"${TARGET_DIR_ROOT}\" USR=\"${TARGET_DIR_USR}\" HOME=\"${TARGET_DIR_HOME}\" ETC=\"${TARGET_DIR_ETC}\"") #https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT.html if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)