@@ -146,13 +146,21 @@ then
146
146
exit 1
147
147
fi
148
148
149
+ cleanup ()
150
+ {
151
+ rm -rf " $PKG_REPO_NAME "
152
+ if [[ -n $manifest ]]; then
153
+ rm -f " $manifest "
154
+ fi
155
+ }
156
+
149
157
PKG ()
150
158
{
151
159
" $@ "
152
160
if [ $? != 0 ]
153
161
then
154
162
echo Command failed: " $@ "
155
- rm -rf " $PKG_REPO_NAME "
163
+ cleanup
156
164
exit 1
157
165
fi
158
166
}
@@ -169,7 +177,7 @@ eval `pkgsend open ${PKG_NAME}@${version}`
169
177
if [ $? != 0 ]
170
178
then
171
179
echo " Fatal: could not open ${PKG_NAME} @${version} "
172
- rm -rf " $PKR_REPO_NAME "
180
+ cleanup
173
181
exit 1
174
182
fi
175
183
@@ -244,12 +252,22 @@ PKG pkgsend add depend fmri=pkg:/web/java-servlet/tomcat-8 type=require
244
252
245
253
PKG pkgsend add file dist/source.war mode=0444 owner=webservd group=webservd path=/usr/opengrok/lib/source.war
246
254
247
- PKG pkgsend add set name=description value=" OpenGrok - wicked fast source browser"
255
+ PKG pkgsend add set name=pkg.description value=" OpenGrok - complete install"
256
+ PKG pkgsend add set name=pkg.summary value=" OpenGrok - wicked fast source browser"
248
257
PKG pkgsend add set name=pkg.human-version value=" ${human_readable_version} "
249
258
PKG pkgsend close
250
259
251
260
PKG pkgrepo -s " $PKG_REPO_NAME " verify
252
261
262
+ manifest=$( mktemp /tmp/manifest.XXXXXX )
263
+ if [[ -z $manifest ]]; then
264
+ echo " cannot create temporary file for package manifest"
265
+ cleanup
266
+ exit 1
267
+ fi
268
+ PKG pkgrepo -s " $PKG_REPO_NAME " contents ${PKG_NAME} > $manifest
269
+ PKG pkglint $manifest
270
+
253
271
# checks whether the same file exists and updates it
254
272
if [ -f " ${PKG_NAME} -${human_readable_version} .p5p" ]
255
273
then
@@ -263,7 +281,7 @@ PKG pkgrecv -s "$PKG_REPO_NAME" -a -d "${outfile}" ${PKG_NAME}
263
281
# cleanup
264
282
if [ -d " $PKG_REPO_NAME " ]
265
283
then
266
- rm -rf " $PKG_REPO_NAME "
284
+ cleanup
267
285
fi
268
286
269
287
unset PKG_REPO
0 commit comments