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
36bbd05d
Commit
36bbd05d
authored
Feb 06, 2010
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use realpath if not readlink, fix readlink workaround with echo
parent
ab10e8a8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
rpmrb
bin/rpmrb
+1
-1
common
share/eterbuild/functions/common
+2
-2
No files found.
bin/rpmrb
View file @
36bbd05d
...
...
@@ -37,7 +37,7 @@ if [ "$1" = "-h" ]; then
exit
0
fi
test
-
e
"
$SPEC
"
||
fatal
"use with spec"
test
-
f
"
$SPEC
"
||
SPEC
=
$(
get_gear_spec
)
$ETERBUILDBIN
/rpmgs
$SPEC
$VER
||
fatal
"Error with get source"
add_changelog_helper
"- new version
$(
get_version
$SPEC
)
(with rpmrb script)"
$SPEC
||
echog
"Changelog entry already exists"
...
...
share/eterbuild/functions/common
View file @
36bbd05d
...
...
@@ -65,7 +65,7 @@ get_root_git_dir()
[
-n
"
$DIR
"
]
||
DIR
=
$(
pwd
)
[
"
$DIR
"
=
"/"
]
&&
return
1
if
[
-d
"
$DIR
/.git"
]
;
then
readlink
-f
"
$DIR
"
readlink
-f
"
$DIR
"
2>/dev/null
||
realpath
"
$DIR
"
return
fi
get_root_git_dir
$(
dirname
"
$DIR
"
)
||
return
1
...
...
@@ -156,7 +156,7 @@ do
# Если файл существует, то добавляем, иначе считаем аргумент параметром.
if
[
-f
"
$i
"
]
;
then
# echo is workaround for missed readlink
LISTNAMES
=
"
$LISTNAMES
$(
readlink
-f
$i
2>/dev/null |
echo
$i
)
"
LISTNAMES
=
"
$LISTNAMES
$(
readlink
-f
"
$i
"
2>/dev/null
||
realpath
"
$i
"
||
echo
"
$i
"
)
"
else
set_target_type
${
i
/-/
}
||
LISTARGS
=
"
$LISTARGS
$i
"
fi
...
...
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