Skip to content

Commit

Permalink
SW-3427 update is failing because of ssh key rotation (#1768)
Browse files Browse the repository at this point in the history
* fix bitbucket ssh key rotation see also 2de739c
* SW-3398 fix "Markierspray" wording/spelling
* fix spelling of "zerteilen"
  • Loading branch information
Josef-MrBeam authored Jun 22, 2023
1 parent dc9d4b7 commit a59ea62
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
10 changes: 10 additions & 0 deletions octoprint_mrbeam/scripts/update_script.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
from octoprint.plugins.softwareupdate import exceptions

from octoprint.settings import _default_basedir

from octoprint_mrbeam import exec_cmd
from octoprint_mrbeam.mrb_logger import mrb_logger

from octoprint_mrbeam.util.pip_util import get_version_of_pip_module, get_pip_caller
Expand Down Expand Up @@ -313,6 +315,14 @@ def run_update():

args = _parse_arguments()

# make sure the ssh key of bitbucket is correct
code = exec_cmd("sudo truncate -s 0 /root/.ssh/known_hosts")
code += exec_cmd(
"sudo ssh-keygen -R bitbucket.org && sudo sh -c 'curl https://bitbucket.org/site/ssh >> /root/.ssh/known_hosts'"
)
if code != 0:
print("error while updating ssh key of bitbucket")

# get dependencies
dependencies = get_dependencies(args.folder)

Expand Down
Binary file modified octoprint_mrbeam/translations/de/LC_MESSAGES/messages.mo
Binary file not shown.
10 changes: 5 additions & 5 deletions octoprint_mrbeam/translations/de/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: Mr_Beam 0.1.61\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2023-04-25 10:57+0200\n"
"PO-Revision-Date: 2023-04-25 10:58+0200\n"
"PO-Revision-Date: 2023-06-22 13:24+0200\n"
"Last-Translator: Andy Werner <[email protected]>\n"
"Language-Team: \n"
"Language: de\n"
Expand Down Expand Up @@ -1684,16 +1684,16 @@ msgid ""
"line distance 0,1mm for the best result."
msgstr ""
"Gravuren auf Edelstahl funktionieren nur mit unserm “Mark Solid” Laser "
"Markierungsspray. Verwende einen Linienabstand von 0,1mm für ein optimales "
"Markierspray. Verwende einen Linienabstand von 0,1mm für ein optimales "
"Ergebnis."

#: octoprint_mrbeam/static/js/app/view-models/modal/material-settings.js:464
msgid ""
"Do not engrave stainless steel without the application of laser marking "
"color."
msgstr ""
"Edelstahl nicht blank gravieren, sonder immer in Verbindung mit unserem "
"Markierugsspay."
"Edelstahl nicht blank gravieren, sondern immer in Verbindung mit unserem "
"Markierspray."

#: octoprint_mrbeam/static/js/app/view-models/modal/ready-to-laser.js:246
msgid "minute"
Expand Down Expand Up @@ -4510,7 +4510,7 @@ msgstr "duplizieren"

#: octoprint_mrbeam/templates/tab_workingarea.jinja2:430
msgid "split"
msgstr "zerteilten"
msgstr "zerteilen"

#: octoprint_mrbeam/templates/tab_workingarea.jinja2:433
msgid "by stroke color"
Expand Down

0 comments on commit a59ea62

Please sign in to comment.