Merge branch 'master' of github.com:alanhg/alfred-workflows

alanhe421 · Jan 13, 2024 · cabf239 · cabf239
2 parents 42fb9e2 + 8b3befe
commit cabf239
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/README-zh.md b/README-zh.md
@@ -36,7 +36,7 @@ P.S.: 使用这些Workflow的前提是已购买[Powerpack](https://www.alfredapp
 ### 2. [About Mac](https://github.com/alanhg/alfred-workflows/tree/master/about-mac)
 > About This Mac
 
-![](https://img.shields.io/badge/version-v1.15-green?style=for-the-badge)
+![](https://img.shields.io/badge/version-v1.16-green?style=for-the-badge)
 [![](https://img.shields.io/badge/download-click-blue?style=for-the-badge)](https://github.com/alanhg/alfred-workflows/raw/master/about-mac/About%20Mac.alfredworkflow)
 [![](https://img.shields.io/badge/plist-link-important?style=for-the-badge)](https://raw.githubusercontent.com/alanhg/alfred-workflows/master/about-mac/src/info.plist)
 

diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ P.S.: You need to buy the [Powerpack](https://www.alfredapp.com/powerpack/) to u
 ### 2. [About Mac](https://github.com/alanhg/alfred-workflows/tree/master/about-mac)
 > About This Mac
 
-![](https://img.shields.io/badge/version-v1.15-green?style=for-the-badge)
+![](https://img.shields.io/badge/version-v1.16-green?style=for-the-badge)
 [![](https://img.shields.io/badge/download-click-blue?style=for-the-badge)](https://github.com/alanhg/alfred-workflows/raw/master/about-mac/About%20Mac.alfredworkflow)
 [![](https://img.shields.io/badge/plist-link-important?style=for-the-badge)](https://raw.githubusercontent.com/alanhg/alfred-workflows/master/about-mac/src/info.plist)
 

diff --git a/about-mac/README.md b/about-mac/README.md
@@ -7,7 +7,7 @@ Contains UserName、Model、HostName、Primary Ethernet Address、IPv4 Address
 
 
 
-![](https://img.shields.io/badge/version-v1.15-green?style=for-the-badge)
+![](https://img.shields.io/badge/version-v1.16-green?style=for-the-badge)
 [![](https://img.shields.io/badge/download-click-blue?style=for-the-badge)](https://github.com/alanhg/alfred-workflows/raw/master/about-mac/About%20Mac.alfredworkflow)
 [![](https://img.shields.io/badge/plist-link-important?style=for-the-badge)](https://raw.githubusercontent.com/alanhg/alfred-workflows/master/about-mac/src/info.plist)
 

diff --git a/about-mac/src/info.plist b/about-mac/src/info.plist
@@ -143,7 +143,7 @@ Contains UserName、Model、HostName、Primary Ethernet Address、IPv4 Address
 	<key>variablesdontexport</key>
 	<array/>
 	<key>version</key>
-	<string>1.15</string>
+	<string>1.16</string>
 	<key>webaddress</key>
 	<string>https://github.com/alanhg/alfred-workflows/tree/master/about-mac</string>
 </dict>

diff --git a/about-mac/src/main.sh b/about-mac/src/main.sh
@@ -7,7 +7,7 @@ freeDiskPercent=$(echo "scale=1; ${arrIN[8]}*100 / ${arrIN[7]}" | bc)
 freeMemoryPercent=$(echo "scale=1; ${arrIN[10]}*100 / ${arrIN[6]}" | bc)
 displayResolution=$(system_profiler SPDisplaysDataType | awk '/Resolution/{print $2, $3, $4}'|tr '\n' ', '| sed 's/,$//')
 uptime=$(uptime)
-systemUptime=$(uptime | awk -F' up |, [0-9]+ user' '{print $2}')
+systemUptime=$(uptime | awk -F' up |, [0-9]+ user' '{print $2}' | xargs)
 
 
 cat << EOF