Skip to content

Commit

Permalink
Merge pull request #6978 from MahtraDR/dependency_fallback_url
Browse files Browse the repository at this point in the history
[scripts][dependency] Cleanup backup repo config
  • Loading branch information
MahtraDR authored Nov 12, 2024
2 parents f34db87 + 7f071c6 commit f62b071
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions dependency.lic
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require 'ostruct'
require 'digest/sha1'
require 'monitor'

$DEPENDENCY_VERSION = '1.7.6'
$DEPENDENCY_VERSION = '1.7.7'
$MIN_RUBY_VERSION = '3.2.2'
DRINFOMON_IN_CORE_LICH ||= false

Expand Down Expand Up @@ -206,7 +206,7 @@ class ScriptManager
@paste_bin_url = 'https://pastebin.com/api/api_post.php'
@firebase_url = 'https://dr-scripts.firebaseio.com/'
@status_repo = Settings['status_repo'] || 'rpherbig/dr-scripts'
@status_branch = Settings['status_branch'] || 'master'
@status_branch = Settings['status_branch'] || 'main'
update_status_url
# Gating setting lich_url on lich version

Expand Down Expand Up @@ -244,11 +244,11 @@ class ScriptManager
def update_status_url
defaulturl = 'https://api.github.com/repos/' + @status_repo + '/git/trees/' + @status_branch
mainurl = 'https://api.github.com/repos/rpherbig/dr-scripts/git/trees/main'
fallbackurl = 'https://api.github.com/repos/rpherbig/dr-scripts/git/trees/master'
fallbackurl = 'https://api.github.com/repos/rpherbig/dr-scripts/git/trees/main'
eo_drscripts = 'https://api.github.com/repos/elanthia-online/dr-scripts/git/trees/main'

unless url_exist?(defaulturl)
_respond Lich::Messaging.monsterbold("Default URL #{defaulturl} not responding. Using an alternate repo+branch combindation.")
_respond Lich::Messaging.monsterbold("Default URL #{defaulturl} not responding. Using an alternate repo+branch combination.")
_respond Lich::Messaging.monsterbold("Unsetting custom repo settings, if any.")
Settings['status_repo'] = nil if Settings['status_repo']
Settings['status_branch'] = nil if Settings['status_branch']
Expand Down Expand Up @@ -295,7 +295,7 @@ class ScriptManager

def unset_custom_status
@status_repo = 'rpherbig/dr-scripts'
@status_branch = 'master'
@status_branch = 'main'
update_status_url
end

Expand Down Expand Up @@ -1713,7 +1713,7 @@ def stop_autostart(script_names)
end
end

def set_custom_status_repo(repo, branch = 'master')
def set_custom_status_repo(repo, branch = 'main')
$manager.set_custom_status_repo(repo, branch)
end

Expand Down

0 comments on commit f62b071

Please sign in to comment.