Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
etersoft-build-utils
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
korinf
etersoft-build-utils
Commits
b6878e36
You need to sign in or sign up before continuing.
Commit
b6878e36
authored
Apr 05, 2024
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rpmgs: add support for url with mask
parent
6a2a176c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
4 deletions
+15
-4
rpmgs
bin/rpmgs
+3
-2
web
share/eterbuild/functions/web
+12
-2
No files found.
bin/rpmgs
View file @
b6878e36
...
...
@@ -126,7 +126,7 @@ download_to()
return
$RET
fi
local
DF
=
"
$(
basename
"
$URL
"
)
"
download_url
"
$URL
"
&&
repack_tarball
"
$DF
"
"
$TARGET
"
download_url
"
$URL
"
&&
DF
=
"
$DOWNLOADEDNAME
"
&&
repack_tarball
"
$DF
"
"
$TARGET
"
local
RET
=
$?
# TODO: repack need remove origin
#rm -fv "$DF"
...
...
@@ -908,7 +908,8 @@ fi
echog
"Try to load
${
GETSOURCEURL
}
for
$spec
"
download_to
"
$GETSOURCEURL
"
"
$FTB
"
||
fatal
"Can't download
$GETSOURCEURL
"
will_commit
||
continue
CURRENTURL
=
"
${
GETSOURCEURL
}
"
# hack: override url from download_to
CURRENTURL
=
"
${
DOWNLOADEDURL
}
"
if
is_gear
;
then
commit_tarball
"
$FTB
"
||
fatal
source_postupdate_hook
...
...
share/eterbuild/functions/web
View file @
b6878e36
...
...
@@ -11,9 +11,19 @@ which GET &>/dev/null && GET=GET || GET=false
which rsync &>/dev/null
&&
RSYNC
=
rsync
||
GET
=
false
# will DOWNLOADEDNAME with real name
download_url
()
{
local
NAME
=
"
$(
basename
"
$1
"
)
"
local
URL
=
"
$1
"
# if has_space
if
[
"
${
URL
/ //
}
"
!=
"
$URL
"
]
;
then
URL
=
"
$(
$EPMCMD
tool eget
--list
--latest
$URL
)
"
[
-n
"
$URL
"
]
||
fatal
"Can't find
$1
tarball."
fi
local
NAME
=
"
$(
basename
"
$URL
"
)
"
# TODO
# do not download if already exists...
#[ -r "$NAME" ] && { echo "skipping $1, already exists..."; return; }
...
...
@@ -21,7 +31,7 @@ download_url()
# NOTE: disable cert checking
# use wget with try=1 and timeout = 30 sec
docmd
epm tool eget
-O
"
$NAME
"
"
$1
"
&&
test
-r
"
$NAME
"
&&
return
docmd
$EPMCMD
tool eget
-O
"
$NAME
"
"
$URL
"
&&
test
-r
"
$NAME
"
&&
DOWNLOADEDNAME
=
"
$NAME
"
&&
DOWNLOADEDURL
=
"
$URL
"
&&
return
rm
-f
"
$NAME
"
return
1
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment