diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index f1bbf2b83c..027f7ff1dd 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' diff --git a/CHANGELOG.md b/CHANGELOG.md index 4256789455..8dcb35548a 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 6cd9429494..bda2635cb3 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" @@ -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}\" 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) set(CMAKE_INSTALL_PREFIX "${TARGET_DIR_USR}" CACHE PATH "..." FORCE) diff --git a/src/detection/battery/battery_android.c b/src/detection/battery/battery_android.c index fe081e85b0..c80e5cf6b7 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 5a304de4cc..e7278407ef 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);