Skip to content

Download spiget resources to tempdir under plugins #1486

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
May 1, 2022
Merged

Download spiget resources to tempdir under plugins #1486

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2b9048
Download spiget resources to tempdir under plugins
virtualdxs Apr 22, 2022
ad62a9a
Add -p flag to mkdir $tempDir
virtualdxs May 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions scripts/start-spiget
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ getResourceFromSpiget() {
mkdir -p /data/plugins

versionfile="/data/plugins/.${resource}-version.json"
versionfileNew="/tmp/.${resource}-version.json"
versionfileNew="${versionfile}.tmp"

if [ -f "$versionfile" ]; then
if [[ -n $(find "$versionfile" -mmin +${SPIGET_DOWNLOAD_TOLERANCE}) ]]; then
Expand Down Expand Up @@ -87,8 +87,10 @@ getResourceFromSpiget() {
downloadResourceFromSpiget() {
resource=${1?}

tempDir="/data/plugins/tmp-${resource}"
mkdir -p $tempDir
resourceUrl="https://api.spiget.org/v2/resources/${resource}"
if ! outfile=$(get_silent --output-filename -o /tmp "${acceptArgs[@]}" "${resourceUrl}/download"); then
if ! outfile=$(get_silent --output-filename -o $tempDir "${acceptArgs[@]}" "${resourceUrl}/download"); then
log "ERROR: failed to download resource '${resource}' from ${resourceUrl}/download"
if externalUrl=$(get --json-path '$.file.externalUrl' "${resourceUrl}"); then
log " Visit $externalUrl to pre-download the resource"
Expand All @@ -107,11 +109,11 @@ downloadResourceFromSpiget() {
elif containsJars "${outfile}"; then
log "Extracting contents of resource ${resource} into plugins"
extract "$outfile" /data/plugins
rm "$outfile"
else
log "ERROR: file for resource ${resource} has an unexpected file type: ${fileType}"
exit 2
fi
rm -rf "$tempDir"
}

if [[ ${SPIGET_RESOURCES} ]]; then
Expand Down