Browse Source

Separate specfile generation from copr triggering

Alois Mahdal 6 years ago
parent
commit
99bd0ba557
1 changed files with 4 additions and 4 deletions
  1. 4
    4
      trigger_copr

+ 4
- 4
trigger_copr View File

@@ -41,7 +41,7 @@ last_version() {
41 41
       | sed "s/^v//"
42 42
 }
43 43
 
44
-trigger() {
44
+mkspec() {
45 45
     local self_version
46 46
     self_version="slop-build-copr $(git describe --tags)"
47 47
     sed -e "
@@ -49,8 +49,7 @@ trigger() {
49 49
         /^Release/ s|__SLOP_RELEASE__|$Release|
50 50
         /^Source0/ s|__SLOP_URLBASE__|$UrlBase|
51 51
         /^# spec file/ s|__SLOP_BUILDSCRIPT_VERSION__|$self_version|
52
-    " <slop.spec.in >"$Tmp/slop.spec"
53
-    copr build --nowait "$CoprProject" "$Tmp/slop.spec"
52
+    " <slop.spec.in
54 53
 }
55 54
 
56 55
 git_guess() {
@@ -111,6 +110,7 @@ main() {
111 110
         test -n "$Version" || Version=$(last_version)
112 111
         test -n "$Release" || Release=1
113 112
     fi
113
+    mkspec >"$Tmp/slop.spec"
114 114
     $DryRun && {
115 115
         warn "dry mode active, we would build:"
116 116
         warn "    at $CoprProject"
@@ -120,7 +120,7 @@ main() {
120 120
         warn "    yielding slop-$Version-$Release.*.rpm"
121 121
         exit 1
122 122
     }
123
-    trigger
123
+    copr build --nowait "$CoprProject" "$Tmp/slop.spec"
124 124
     rm -rf "$Tmp"
125 125
 }
126 126