Make remote paths configurable

This commit is contained in:
2021-01-02 07:39:32 +01:00
parent 2910a89d6c
commit 839d42faf4
5 changed files with 22 additions and 14 deletions

View File

@ -4,6 +4,7 @@
# frozen_string_literal: true
require_relative '../config/config'
require_relative 'package'
require 'net/http'
@ -56,7 +57,7 @@ def download(uri, target)
end
def hosted_sources(absolute_url)
"https://download.dlackware.com/hosted-sources#{absolute_url}"
CONFIG[:download_url] + absolute_url
end
def remote_file_exists?(url)
@ -70,8 +71,7 @@ def remote_file_exists?(url)
end
def upload_command(local_path, remote_path)
"scp slackbuilds/#{local_path} "\
"caraus.de:/srv/httpd/dlackware/download/hosted-sources#{remote_path}"
['scp', "slackbuilds/#{local_path} ", CONFIG[:remote_path] + remote_path]
end
def clone_and_archive(repo, name_version, tarball)
@ -99,7 +99,7 @@ def clone(repo, tarball)
clone_and_archive repo, name_version, tarball
sh upload_command(tarball, remote_path)
sh(*upload_command(tarball, remote_path))
Digest::MD5.hexdigest File.read("slackbuilds/#{tarball}")
end
@ -113,7 +113,7 @@ def download_and_deploy(uri, tarball)
end
checksum = download uri, "slackbuilds/#{tarball}"
sh upload_command(tarball, remote_path)
sh(*upload_command(tarball, remote_path))
checksum.hexdigest
end