Skip to content

Commit 6b7a7f1

Browse files
committed
Some minor fixes to rpm/buildrpms.sh
1 parent 4ddfd13 commit 6b7a7f1

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

rpm/buildrpms.sh

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ then
4343
mock_args="--old-chroot"
4444
fi
4545

46+
relver=1
4647
compile_spec_only=0
4748
build_only=0
4849
srpm_only=0
@@ -82,13 +83,14 @@ then
8283
# Get next release version number and increment after
8384
if [ ! -f version.cfg ]
8485
then
85-
echo "relver=1" > version.cfg
86-
fi
87-
source version.cfg
88-
if [ "$build_only" -ne "1" ]
89-
then
90-
(( relver+=1 ))
9186
echo "relver=$relver" > version.cfg
87+
else
88+
source version.cfg
89+
if [ "$build_only" -ne "1" ]
90+
then
91+
(( relver+=1 ))
92+
echo "relver=$relver" > version.cfg
93+
fi
9294
fi
9395
timestamp=0
9496
else
@@ -139,7 +141,7 @@ then
139141
--define "_relver $relver" \
140142
--define "_version $version" \
141143
--define "_timestamp $timestamp" \
142-
--resultdir=$OUTDIR $mock_args -ne 0;
144+
--resultdir=$OUTDIR $mock_args
143145
then
144146
print_error "Creating source package failed"
145147
exit 1
@@ -171,7 +173,7 @@ do :
171173
--define "_relver $relver" \
172174
--define "_version $version" \
173175
--define "_timestamp $timestamp" \
174-
--resultdir=$OUTDIR/$arch $mock_args -eq 0;
176+
--resultdir=$OUTDIR/$arch $mock_args
175177
then
176178
# Add to package list
177179
packages="$packages $(ls $OUTDIR/$arch/*-$version-$relver.*.rpm)"

0 commit comments

Comments
 (0)