From 9074fdf31bff8ce70547feff04c86174372ebb5e Mon Sep 17 00:00:00 2001 From: hjmmc Date: Fri, 17 Apr 2020 17:14:23 +0800 Subject: [PATCH 1/4] add local mode support --- hidpi.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/hidpi.sh b/hidpi.sh index 7fe31a9..3db6411 100755 --- a/hidpi.sh +++ b/hidpi.sh @@ -5,6 +5,8 @@ systemVersion=($(sw_vers -productVersion | cut -d "." -f 2)) systemLanguage=($(locale | grep LANG | sed s/'LANG='// | tr -d '"' | cut -d "." -f 1)) disableSIP="Need to disable SIP" +langRemoteMode="Remote Mode" +langLocalMode="Local Mode" langDisplay="Display" langMonitors="Monitors" langIndex="Index" @@ -37,6 +39,8 @@ langChooseResOpCustom="(6) Manual input resolution" if [[ "${systemLanguage}" == "zh_CN" ]]; then disableSIP="需要关闭 SIP" + langRemoteMode="远程模式" + langLocalMode="本地模式" langDisplay="显示器" langMonitors="显示器" langIndex="序号" @@ -72,6 +76,15 @@ downloadHost="https://raw.githubusercontent.com/xzhih/one-key-hidpi/master" # downloadHost="https://raw.githubusercontent.com/xzhih/one-key-hidpi/dev" # downloadHost="http://127.0.0.1:8080" +shellDir="$( cd "$( dirname "$0" )" && pwd )" + +if [ -d "${shellDir}/displayIcons" ];then + echo $langLocalMode + downloadHost="fiel://${shellDir}" +else + echo $langRemoteMode +fi + if [[ "${sipInfo}" == *"Filesystem Protections: disabled"* ]] || [[ "$(awk '{print $5}' <<< "${sipInfo}")" == "disabled." ]] || [[ "$(awk '{print $5}' <<< "${sipInfo}")" == "disabled" ]]; then : else From 8aeb90d5ace254e1bf6ef8428ec88a44092fc5dd Mon Sep 17 00:00:00 2001 From: hjmmc Date: Fri, 17 Apr 2020 17:24:12 +0800 Subject: [PATCH 2/4] add local mode support --- hidpi.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hidpi.sh b/hidpi.sh index 3db6411..f08eeef 100755 --- a/hidpi.sh +++ b/hidpi.sh @@ -76,11 +76,11 @@ downloadHost="https://raw.githubusercontent.com/xzhih/one-key-hidpi/master" # downloadHost="https://raw.githubusercontent.com/xzhih/one-key-hidpi/dev" # downloadHost="http://127.0.0.1:8080" -shellDir="$( cd "$( dirname "$0" )" && pwd )" +shellDir="$(dirname $0)" if [ -d "${shellDir}/displayIcons" ];then echo $langLocalMode - downloadHost="fiel://${shellDir}" + downloadHost="file://${shellDir}" else echo $langRemoteMode fi From 4d0af8a1511c48a880b9fdf737d4157ed10ef181 Mon Sep 17 00:00:00 2001 From: hjmmc Date: Fri, 17 Apr 2020 17:36:57 +0800 Subject: [PATCH 3/4] update README --- README-zh.md | 4 +++- README.md | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README-zh.md b/README-zh.md index b1165c5..bae34f5 100755 --- a/README-zh.md +++ b/README-zh.md @@ -20,12 +20,14 @@ macOS 的 DPI 机制和 Windows 下不一样,比如 1080p 的屏幕在 Windows ## 使用方法 -在终端输入以下命令回车即可 +1.远程模式: 在终端输入以下命令回车即可 ```bash bash -c "$(curl -fsSL https://raw.githubusercontent.com/xzhih/one-key-hidpi/master/hidpi.sh)" ``` +2.本地模式: 下载项目解压,把 `hidpi.sh` 拖进终端按回车运行 + ![运行](./img/run-zh.jpg) ## 恢复 diff --git a/README.md b/README.md index b9cace1..722aad9 100755 --- a/README.md +++ b/README.md @@ -18,12 +18,14 @@ System Preferences ## Usage -Run this script in Terminal +1.Remote Mode: Run this script in Terminal ```bash bash -c "$(curl -fsSL https://raw.githubusercontent.com/xzhih/one-key-hidpi/master/hidpi.sh)" ``` +2.Local Mode: Download ZIP, decompressing it, drag the `hidpi.sh` file into the terminal and press Enter to run + ![RUN](./img/run.jpg) ## Recovery From 2459268e7b5d9a01aab3b29ff937cb59c8cac427 Mon Sep 17 00:00:00 2001 From: hjmmc Date: Fri, 17 Apr 2020 17:58:39 +0800 Subject: [PATCH 4/4] add hidpi.command --- README-zh.md | 2 +- README.md | 2 +- hidpi.command | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100755 hidpi.command diff --git a/README-zh.md b/README-zh.md index bae34f5..b465d73 100755 --- a/README-zh.md +++ b/README-zh.md @@ -26,7 +26,7 @@ macOS 的 DPI 机制和 Windows 下不一样,比如 1080p 的屏幕在 Windows bash -c "$(curl -fsSL https://raw.githubusercontent.com/xzhih/one-key-hidpi/master/hidpi.sh)" ``` -2.本地模式: 下载项目解压,把 `hidpi.sh` 拖进终端按回车运行 +2.本地模式: 下载项目解压,双击 `hidpi.command` 运行 ![运行](./img/run-zh.jpg) diff --git a/README.md b/README.md index 722aad9..42dba2b 100755 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ System Preferences bash -c "$(curl -fsSL https://raw.githubusercontent.com/xzhih/one-key-hidpi/master/hidpi.sh)" ``` -2.Local Mode: Download ZIP, decompressing it, drag the `hidpi.sh` file into the terminal and press Enter to run +2.Local Mode: Download ZIP, decompressing it, and double click `hidpi.command` to run ![RUN](./img/run.jpg) diff --git a/hidpi.command b/hidpi.command new file mode 100755 index 0000000..1607b88 --- /dev/null +++ b/hidpi.command @@ -0,0 +1,6 @@ +#!/bin/bash + +DIR="$( cd "$( dirname "$0" )" && pwd )" + +$DIR/hidpi.sh +