-
-
Notifications
You must be signed in to change notification settings - Fork 307
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
Fix Jellyfin not installing correctly #1032
Open
KatieTheDev
wants to merge
29
commits into
swizzin:develop
Choose a base branch
from
KatieTheDev:develop
base: develop
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
29 commits
Select commit
Hold shift + click to select a range
1d7b4da
fix(apt): :construction: Switch Jellyfin over to the new official rep…
a3e7477
style(apt): :construction: Fix typo in a comment explaining something
1d3e3f2
fix(apt): :package: Switch Jellyfin to the new repositories.
bbe6273
style(shellcheck): :fire: Remove unnecessary variables
cacdb90
style(echos): :art: Added some echos to better describe what is happe…
a0a231c
style(echos): :art: Echo improvements
43b7a57
fix: :bug: Checking architecture errors out install script before any…
fade94a
fix: :bug: BASE_OS must be present in order to get the right repository
94ddc93
fix: :bug: dist_info not found, removed.
1ecbff5
fix: :bug: Version checking is redundant as swizzin is only supported…
870fc5f
fix(setup): :bug: Added a way to fetch and install signing key
cc216ec
fix: :bug: Script failing to get signing keys due to improper impleme…
89a5568
fix: :bug: Use curl -fsSL to get key. Previous implementation causing…
799c871
style: :fire: Remove unnecessary echoes
41d641e
style: :art: Changed verbiage of some echoes and changed echo type fo…
6f83dd6
style(echos): :art: Further improvements to echoes.
bdf19c9
fix: :bug: Fixing same issue that I found in the install script.
2404dae
fix(shellcheck): :art: Shellcheck was complaining about this
2678a36
refactor: :art: More elegant way of disabling and removing services.
b70e6e8
style(echos): :art: Making some echoes look nice
4d83319
feat: :sparkles: Automatically update the Jellyfin key
1b2839e
fix: Trying to fix merge conflict
fb90ac2
Merge branch 'swizzin:develop' into develop
KatieTheDev 7f73a11
style(echos): :art: Modify echoes
2b25b27
style(apt): :art: Remove unsupported distros from switching.
de9d67b
style: :art: Use some more builtins
4be6eee
fix: :art: Remove Ubuntu-centric "universe" repo
f746309
style: :art: Use more builtins
83b0a17
style: :art: Move repo-adding to a seperate function as it is replica…
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
#!/bin/bash | ||
# Contributers: katiethedev | ||
# This functions file is created to resolve some replicated code between the install and update functions. | ||
|
||
# This function adds the Jellyfin repository. | ||
function add_jellyfin_repo() { | ||
# Set required variables | ||
ARCHITECTURE="$(_os_arch)" | ||
BASE_OS="$(_os_distro)" | ||
case "${BASE_OS}" in | ||
raspbian) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't think raspbian will pass this check so we don't need to write a case for it |
||
# Raspbian uses the Debian repository | ||
REPO_OS="debian" | ||
;; | ||
*) | ||
REPO_OS="${BASE_OS}" | ||
VERSION="$(awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-release)" | ||
;; | ||
esac | ||
|
||
# Install the Deb822 format jellyfin.sources entry | ||
echo_progress_start "Adding Jellyfin repository to apt." | ||
cat << EOF | tee /etc/apt/sources.list.d/jellyfin.sources | ||
Types: deb | ||
URIs: https://repo.jellyfin.org/${REPO_OS} | ||
Suites: ${VERSION} | ||
Components: main | ||
Architectures: ${ARCHITECTURE} | ||
Signed-By: /etc/apt/keyrings/jellyfin.gpg | ||
EOF | ||
echo_progress_done "Jellyfin repository added." | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
gnupg2 is a global dependency of swizzin. You can safely assume every user has this installed already.