Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor clean-up #122

Merged
merged 3 commits into from
Nov 15, 2023
Merged

Minor clean-up #122

merged 3 commits into from
Nov 15, 2023

Conversation

Forage
Copy link
Contributor

@Forage Forage commented Nov 15, 2023

Prevents garbled output when importing the keyring:

Screenshot from 2023-11-15 15-10-40

Also, no need to install openmediavault-keyring package specifically since it's an openmediavault package dependency.

Prevents garbled output when importing the keyring.

Also, no need to install openmediavault-keyring package specifically since it's an openmediavault package dependency.
@ryecoaaron
Copy link

Might as well redirect (>) directly to the file instead of using tee and redirecting the output to /dev/null.

@Forage
Copy link
Contributor Author

Forage commented Nov 15, 2023

Using tee allows you to add a sudo in front of it for writing permissions for non root users. That's why I kept it.

@ryecoaaron
Copy link

Just a note that sudo isn't installed by default on a minimal Debian install.

@@ -33,7 +33,7 @@ instructions only partially work. Please refer to a specific `installation scrip
Install the |omv| keyring manually::

apt-get install --yes gnupg
wget --quiet --output-document=- https://packages.openmediavault.org/public/archive.key | gpg --dearmor | tee "/usr/share/keyrings/openmediavault-archive-keyring.gpg"
wget --quiet --output-document=- https://packages.openmediavault.org/public/archive.key | gpg --dearmor | tee "/usr/share/keyrings/openmediavault-archive-keyring.gpg" >/dev/null
Copy link
Member

@votdev votdev Nov 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
wget --quiet --output-document=- https://packages.openmediavault.org/public/archive.key | gpg --dearmor | tee "/usr/share/keyrings/openmediavault-archive-keyring.gpg" >/dev/null
wget --quiet --output-document=- https://packages.openmediavault.org/public/archive.key | gpg --dearmor --output "/usr/share/keyrings/openmediavault-archive-keyring.gpg"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good one. Does the trick as well, sudo included for gpg this time, be it with the 'old' path ;)

@Forage
Copy link
Contributor Author

Forage commented Nov 15, 2023

Depends on the install config ;) sudo is installed automatically if you install Debian without providing a root password, so root is disabled and the primary user gets sudo privileges.

@ryecoaaron
Copy link

The --yes flag should be used if --output is used just in case the file exists.

@Forage
Copy link
Contributor Author

Forage commented Nov 15, 2023

The --yes flag should be used if --output is used just in case the file exists.

Nice one too. Including the --yes is consistent with the other command you are using so yeah.
Odd though, the --yes is not in the help but it does indeed work.

What a discussion for just a 'quick' and 'minor' clean-up ;)

@Forage
Copy link
Contributor Author

Forage commented Nov 15, 2023

Is there anyway I can squash the three commits from the GitHub web UI at this stage?

@votdev
Copy link
Member

votdev commented Nov 15, 2023

Is there anyway I can squash the three commits from the GitHub web UI at this stage?

I can do that when merging.

@votdev votdev merged commit 24028e2 into openmediavault:master Nov 15, 2023
votdev added a commit that referenced this pull request Nov 15, 2023
* Minor clean-up

Prevents garbled output when importing the keyring.

Also, no need to install openmediavault-keyring package specifically since it's an openmediavault package dependency.

* Remove tee

* Silently approve gpg

(cherry picked from commit 24028e2)
Signed-off-by: Volker Theile <[email protected]>
@Forage Forage deleted the patch-2 branch November 16, 2023 08:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants