hiro/rmview
1
0
Fork 0
mirror of https://github.com/vale981/rmview synced 2025-03-05 17:21:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only apply patch to RM2

Browse source
This commit is contained in:
Emanuele 2021-03-29 10:59:38 +02:00
parent aa82dc24e5
commit 31ff7ff811
2 changed files with 29 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
bin/libcrypto.so.1.0.2.gz Executable file → Normal file
View file

Binary file not shown.

57
src/rmview/rmview.py
View file

@ -237,36 +237,37 @@ class rMViewApp(QApplication):
sftp = None
# check needed files are in place
_,out,_ = ssh.exec_command("[ -x /usr/lib/libcrypto.so.1.0.2 ]")
if out.channel.recv_exit_status() != 0:
answer = QMessageBox.question(self.viewer,
"Missing libcrypto 1.0.2",
"Your reMarkable is missing the right version of a library needed by rmView.\n"\
"This is most probably a result of updating the tablet to version 2.6.\n\n"\
"Would you like rmView to install the missing library?\n"\
"To resolve the issue manually, press NO and consult the documentation.")
if answer == QMessageBox.Yes:
log.info("Installing libcrypto...")
try:
sftp = ssh.open_sftp()
from stat import S_IXUSR
fo = QFile(':bin/libcrypto.so.1.0.2.gz')
fo.open(QIODevice.ReadOnly)
sftp.putfo(fo, '/usr/lib/libcrypto.so.1.0.2.gz')
fo.close()
_,out,_ = ssh.exec_command("/bin/gunzip /usr/lib/libcrypto.so.1.0.2.gz")
out = out.channel.recv_exit_status()
if out != 0:
raise Exception("libcrypto could not be decompressed on the tablet [%d]" % out)
log.info("Installation successful!")
except Exception as e:
log.error('%s %s', type(e), e)
QMessageBox.critical(None, "Error", 'There has been an error while trying to install the required components on the tablet.\n%s.' % e)
if version == 2:
_,out,_ = ssh.exec_command("[ -x /usr/lib/libcrypto.so.1.0.2 ]")
if out.channel.recv_exit_status() != 0:
answer = QMessageBox.question(self.viewer,
"Missing libcrypto 1.0.2",
"Your reMarkable is missing the right version of a library needed by rmView.\n"\
"This is most probably a result of updating the tablet to version 2.6.\n\n"\
"Would you like rmView to install the missing library?\n"\
"To resolve the issue manually, press NO and consult the documentation.")
if answer == QMessageBox.Yes:
log.info("Installing libcrypto...")
try:
sftp = ssh.open_sftp()
from stat import S_IXUSR
fo = QFile(':bin/libcrypto.so.1.0.2.gz')
fo.open(QIODevice.ReadOnly)
sftp.putfo(fo, '/usr/lib/libcrypto.so.1.0.2.gz')
fo.close()
_,out,_ = ssh.exec_command("/bin/gunzip /usr/lib/libcrypto.so.1.0.2.gz")
out = out.channel.recv_exit_status()
if out != 0:
raise Exception("libcrypto could not be decompressed on the tablet [%d]" % out)
log.info("Installation successful!")
except Exception as e:
log.error('%s %s', type(e), e)
QMessageBox.critical(None, "Error", 'There has been an error while trying to install the required components on the tablet.\n%s.' % e)
self.quit()
return
else:
self.quit()
return
else:
self.quit()
return
_,out,_ = ssh.exec_command("[ -x $HOME/rM-vnc-server-standalone ]")
if out.channel.recv_exit_status() != 0: