22#  Copyright (c) 2021 The Toltec Contributors
33#  SPDX-License-Identifier: MIT
44
5- archs=(rm1 rm2 )
5+ archs=(rm1os2 rm2os2 )
66pkgnames=(ddvk-hacks)
77pkgdesc=" Enhance Xochitl with additional features" 
88url=https://github.com/ddvk/remarkable-hacks
9- pkgver=39.01-2 
9+ pkgver=39.01-4 
1010timestamp=2022-11-09T18:31:51Z
1111section=" readers" 
1212maintainer=
" Mattéo Delabre <[email protected] >" @@ -20,55 +20,58 @@ sha256sums=(d3b1413bb9219804581afab598e7f5308233e7467d64e8084e67aae7346beaba)
2020_patches_dir=" /opt/share/ddvk-hacks" 
2121_xochitl_path=" /usr/bin/xochitl" 
2222_work_dir=" /home/root/.local/share/ddvk-hacks" 
23+ _info_path=" $_work_dir /xochitl.info" 
2324_backup_path=" $_work_dir /xochitl.backup" 
2425_old_backup_path=" $_backup_path .old" 
2526_patched_path=" $_work_dir /xochitl.patched" 
2627
2728package () {
28-     if  [[ $arch  =  rm1 ]];  then 
29-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
30-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
31-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
32-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
33-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
34-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
35-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
36-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
37-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
38-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
39-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
40-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
41-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
42-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
43-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
44-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
45-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
46-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
47-     elif  [[ $arch  =  rm2 ]];  then 
48-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
49-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
50-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
51-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
52-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
53-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
54-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
55-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
56-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
57-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
58-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
59-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
60-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
61-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
62-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
63-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
64-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
65-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
66-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
67-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
68-         install -D -m 644 -t " $pkgdir$_patches_dir " " $srcdir " 
29+     mkdir -p " $pkgdir " 
30+     touch " $pkgdir " " $pkgname " 
31+     if  [[ $arch  =  rm1os2 ]];  then 
32+         patches_dir=" ${pkgdir}${_patches_dir} " 
33+         install -D -m 644 -t " $patches_dir " " $srcdir " 
34+         install -D -m 644 -t " $patches_dir " " $srcdir " 
35+         install -D -m 644 -t " $patches_dir " " $srcdir " 
36+         install -D -m 644 -t " $patches_dir " " $srcdir " 
37+         install -D -m 644 -t " $patches_dir " " $srcdir " 
38+         install -D -m 644 -t " $patches_dir " " $srcdir " 
39+         install -D -m 644 -t " $patches_dir " " $srcdir " 
40+         install -D -m 644 -t " $patches_dir " " $srcdir " 
41+         install -D -m 644 -t " $patches_dir " " $srcdir " 
42+         install -D -m 644 -t " $patches_dir " " $srcdir " 
43+         install -D -m 644 -t " $patches_dir " " $srcdir " 
44+         install -D -m 644 -t " $patches_dir " " $srcdir " 
45+         install -D -m 644 -t " $patches_dir " " $srcdir " 
46+         install -D -m 644 -t " $patches_dir " " $srcdir " 
47+         install -D -m 644 -t " $patches_dir " " $srcdir " 
48+         install -D -m 644 -t " $patches_dir " " $srcdir " 
49+         install -D -m 644 -t " $patches_dir " " $srcdir " 
50+         install -D -m 644 -t " $patches_dir " " $srcdir " 
51+     elif  [[ $arch  =  rm2os2 ]];  then 
52+         patches_dir=" ${pkgdir}${_patches_dir} " 
53+         install -D -m 644 -t " $patches_dir " " $srcdir " 
54+         install -D -m 644 -t " $patches_dir " " $srcdir " 
55+         install -D -m 644 -t " $patches_dir " " $srcdir " 
56+         install -D -m 644 -t " $patches_dir " " $srcdir " 
57+         install -D -m 644 -t " $patches_dir " " $srcdir " 
58+         install -D -m 644 -t " $patches_dir " " $srcdir " 
59+         install -D -m 644 -t " $patches_dir " " $srcdir " 
60+         install -D -m 644 -t " $patches_dir " " $srcdir " 
61+         install -D -m 644 -t " $patches_dir " " $srcdir " 
62+         install -D -m 644 -t " $patches_dir " " $srcdir " 
63+         install -D -m 644 -t " $patches_dir " " $srcdir " 
64+         install -D -m 644 -t " $patches_dir " " $srcdir " 
65+         install -D -m 644 -t " $patches_dir " " $srcdir " 
66+         install -D -m 644 -t " $patches_dir " " $srcdir " 
67+         install -D -m 644 -t " $patches_dir " " $srcdir " 
68+         install -D -m 644 -t " $patches_dir " " $srcdir " 
69+         install -D -m 644 -t " $patches_dir " " $srcdir " 
70+         install -D -m 644 -t " $patches_dir " " $srcdir " 
71+         install -D -m 644 -t " $patches_dir " " $srcdir " 
72+         install -D -m 644 -t " $patches_dir " " $srcdir " 
73+         install -D -m 644 -t " $patches_dir " " $srcdir " 
6974    fi 
70-     touch " $srcdir " 
71-     install -D -m 666 -t " $pkgdir " " $srcdir " 
7275}
7376
7477configure () {
@@ -78,7 +81,7 @@ configure() {
7881    local  device
7982    local  original_hash
8083    local  xochitl_version
81-     if  [[ $arch  =  rm1  ]];  then 
84+     if  [[ $arch  =  rm1os2  ]];  then 
8285        device=" reMarkable 1" 
8386        case  " $build_date " in 
8487            " 20221026103859" 
@@ -179,7 +182,7 @@ configure() {
179182                exit  1
180183                ;;
181184        esac 
182-     elif  [[ $arch  =  rm2  ]];  then 
185+     elif  [[ $arch  =  rm2os2  ]];  then 
183186        device=" reMarkable 2" 
184187        case  " $build_date " in 
185188            " 20221026104022" 
@@ -328,11 +331,25 @@ configure() {
328331    cp " $_patched_path " " $_xochitl_path " 
329332    rm -rf /home/root/.cache/remarkable/xochitl/qmlcache/* 
330333
334+     #  shellcheck source=../toltec-bootstrap/toltecctl
335+     source  /home/root/.local/bin/toltecctl
336+     get-release-version >  " $_info_path " 
337+ 
331338    echo  " Please restart Xochitl to use the patches" 
332339    echo 
333340}
334341
335342_restore () {
343+     #  shellcheck source=../toltec-bootstrap/toltecctl
344+     source  /home/root/.local/bin/toltecctl
345+ 
346+     if  !  [ -f  " $_info_path " 
347+         ||  [[ " $( get-release-version) " !=  " $( cat " $_info_path " ) " 
348+         ||  compare-versions " $( get-release-version) " " 3.0" ;  then 
349+         echo  " Skipping restore, as you are on a newer OS version" 
350+         return 
351+     fi 
352+ 
336353    echo 
337354    echo  " Restoring the original Xochitl binary" 
338355
@@ -342,6 +359,7 @@ _restore() {
342359    else 
343360        cp " $_backup_path " " $_xochitl_path " 
344361        rm -rf /home/root/.cache/remarkable/xochitl/qmlcache/* 
362+         rm " $_info_path " 
345363    fi 
346364
347365    echo 
0 commit comments