fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-03-04 20:00:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

contrib/makerepo: update makerepo.sh to better detect rhpkg/fedpkg

Browse source 
Also, allow makerepo.sh not to be in the root directory of the
dist-git checkout. Instead, your current working directory
must now be inside the git working copy

Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller 2014-02-28 15:27:58 +01:00
parent ad848122cf
commit 2119432cdd
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
contrib/fedora/utils/makerepo.sh
View file

@ -7,10 +7,24 @@ die() {
exit 1
}
if grep -q '^NAME="Red Hat Enterprise Linux' /etc/os-release ; then
FEDPKG=rhpkg
else
FEDPKG=fedpkg
srcdir="$(readlink -f "$(git rev-parse --show-toplevel 2>/dev/null)")"
[[ "x$srcdir" != x ]] || die "Could not detect dist-git directory (are you inside the git working directory?)"
cd "$srcdir" || die "Could not switch to dist-git directory"
(test -f $srcdir/NetworkManager.spec \
&& test -f $srcdir/sources) || {
die "**Error**: Directory "\`$srcdir\'" does not look like the NM pkg dir." \
"Copy the file \"$(readlink -f "$0")\" to the dist-git base directory"
}
if [[ "$FEDPKG" == "" ]]; then
REMOTES="$(git remote -v 2>/dev/null)" || die "not inside dist-git repository? >>$PWD<<"
if echo "$REMOTES" | grep -q -F 'pkgs.devel.redhat.com' ; then
FEDPKG=rhpkg
else
FEDPKG=fedpkg
fi
fi
split_patch() {
@ -81,15 +95,6 @@ for ARG; do
esac
done
srcdir="$(dirname "$(readlink -f "$0")")"
(test -f $srcdir/NetworkManager.spec \
&& test -f $srcdir/sources) || {
echo "**Error**: Directory "\`$srcdir\'" does not look like the NM pkg dir."
echo "Copy the file \"$(readlink -f "$0")\" to the dist-git base directory"
exit 1
}
# generate the clean dir
$FEDPKG prep || die "error while \`$FEDPKG prep\`"