Skip to content

Commit 10f0894

Browse files
committed
Replace ht 0.4.0 with xh 0.16.1 (project was renamed)
xh supports more modern https crypto
1 parent 636e2b1 commit 10f0894

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111
- Only call eips if fetch-dashboard succesfully completes
1212
- Ensure a full screen refresh is triggered after wake from sleep
1313
- Build ht from upstream sources, using rusttls instead of vendored openssl
14+
- Replace ht 0.4.0 with xh 0.16.1 (project was renamed)
1415

1516
## [v1.0.0-beta.3] - 2020-02-03
1617

Makefile

+8-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SRC_FILES := $(shell find src -name '*.sh' -o -name '*.png')
22
NEXT_WAKEUP_SRC_FILES := $(shell find src/next-wakeup/src -name '*.rs')
33
TARGET_FILES := $(SRC_FILES:src/%=dist/%)
44

5-
dist: dist/next-wakeup dist/ht dist/local/state ${TARGET_FILES}
5+
dist: dist/next-wakeup dist/xh dist/local/state ${TARGET_FILES}
66

77
tarball: dist
88
tar -C dist -cvzf kindle-dash-${VERSION}.tgz ./
@@ -16,17 +16,17 @@ dist/next-wakeup: ${NEXT_WAKEUP_SRC_FILES}
1616
cd src/next-wakeup && cross build --release --target arm-unknown-linux-musleabi
1717
cp src/next-wakeup/target/arm-unknown-linux-musleabi/release/next-wakeup dist/
1818

19-
dist/ht: tmp/ht
20-
cd tmp/ht && cross build --release --target arm-unknown-linux-musleabi
19+
dist/xh: tmp/xh
20+
cd tmp/xh && cross build --release --target arm-unknown-linux-musleabi
2121
docker run --rm \
22-
-v $(shell pwd)/tmp/ht:/src \
22+
-v $(shell pwd)/tmp/xh:/src \
2323
rustembedded/cross:arm-unknown-linux-musleabi-0.2.1 \
24-
/usr/local/arm-linux-musleabi/bin/strip /src/target/arm-unknown-linux-musleabi/release/ht
25-
cp tmp/ht/target/arm-unknown-linux-musleabi/release/ht dist/
24+
/usr/local/arm-linux-musleabi/bin/strip /src/target/arm-unknown-linux-musleabi/release/xh
25+
cp tmp/xh/target/arm-unknown-linux-musleabi/release/xh dist/
2626

27-
tmp/ht:
27+
tmp/xh:
2828
mkdir -p tmp/
29-
git clone --depth 1 --branch v0.4.0 https://github.com/ducaale/ht.git tmp/ht
29+
git clone --depth 1 --branch v0.16.1 https://github.com/ducaale/xh.git tmp/xh
3030

3131
dist/local/state:
3232
mkdir dist/local/state

src/local/fetch-dashboard.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/usr/bin/env sh
22
# Fetch a new dashboard image, make sure to output it to "$1".
33
# For example:
4-
"$(dirname "$0")/../ht" -d -q -o "$1" get https://raw.githubusercontent.com/pascalw/kindle-dash/master/example/example.png
4+
"$(dirname "$0")/../xh" -d -q -o "$1" get https://raw.githubusercontent.com/pascalw/kindle-dash/master/example/example.png

src/local/low-battery.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ now=$(date +%s)
1010

1111
if [ "$previous_report_timestamp" -eq -1 ] ||
1212
[ $((now - previous_report_timestamp)) -gt 86400 ]; then
13-
# Replace this with for example an HTTP call via curl, or ht
13+
# Replace this with for example an HTTP call via curl, or xh
1414
echo "Reporting low battery: $battery_level_percentage%"
1515

1616
echo "$now" >"$last_battery_report_state"

0 commit comments

Comments
 (0)