Skip to content

Commit

Permalink
Merge pull request #7021 from MahtraDR/dependency_self_update_check
Browse files Browse the repository at this point in the history
[scripts][dependency] Add case for when we update via repository.lic
  • Loading branch information
MahtraDR authored Dec 12, 2024
2 parents 9739099 + 69198cd commit 57b0001
Showing 1 changed file with 8 additions and 14 deletions.
22 changes: 8 additions & 14 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 = '2.0.4'
$DEPENDENCY_VERSION = '2.0.5'
$MIN_RUBY_VERSION = '3.2.2'
DRINFOMON_IN_CORE_LICH ||= false
DRINFOMON_CORE_LICH_DEFINES ||= Array.new
Expand Down Expand Up @@ -387,6 +387,13 @@ class ScriptManager
return unless info
return if get_versions[filename] == info['sha'] && !force

if filename == 'dependency.lic' && File.exist?(File.join(SCRIPT_DIR, filename))
body = File.open(File.join(SCRIPT_DIR, filename), 'r').readlines.join('')
@versions[filename] = Digest::SHA1.hexdigest('blob' + " #{body.size}" + "\0" + body)

return if info['sha'] == @versions[filename]
end

echo("info:#{info}") if @debug
blob = make_request(info['url'])
File.open(File.join(SCRIPT_DIR, "#{filename}"), 'w') { |file| file.print(Base64.decode64(blob['content'])) }
Expand Down Expand Up @@ -488,19 +495,6 @@ class ScriptManager
start_script(filename)
end

def file_outdated?(filename)
echo("file_outdated?:#{filename}") if @debug
local_version = get_versions[filename]
echo("local:#{local_version}") if @debug
info = get_file_status(filename)
unless info
echo("file not found in repository: #{filename}")
return false
end
echo("remote:#{info['sha']}") if @debug
info['sha'] != local_version
end

def get_file_status(filename)
get_status['tree'].find { |element| element['path'] == filename }
end
Expand Down

0 comments on commit 57b0001

Please sign in to comment.