Skip to content

Commit f480a2c

Browse files
committed
fix package creation, change publisher name, remove p5p file before creating new one
1 parent 757ed62 commit f480a2c

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

platform/solaris/ips/create.sh

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#! /bin/ksh -p
1+
#!/usr/bin/ksh -p
22
#
33
# CDDL HEADER START
44
#
@@ -24,7 +24,7 @@
2424

2525

2626
PKG_REPO_NAME=myrepo
27-
PKG_PUBLISHER=opengrokpublisher
27+
PKG_PUBLISHER=opengrok
2828
PKG_NAME=opengrok
2929

3030
case "$1" in
@@ -230,7 +230,7 @@ PKG pkgsend add depend fmri=pkg:/web/java-servlet/tomcat type=require
230230
# This has to stay commented until the next release of Solaris will contain the exhuberant ctags package
231231
#PKG pkgsend add depend fmri=pkg:/developer/tool/exuberant-ctags type=require
232232

233-
PKG pkgsend add file dist/source.war mode=0444 owner=webservd group=webservd path=/var/tomcat6/webapps/source.war
233+
PKG pkgsend add file dist/source.war mode=0444 owner=webservd group=webservd path=/usr/opengrok/lib/source.war
234234

235235
PKG pkgsend add set name=description value="OpenGrok - wicked fast source browser"
236236
PKG pkgsend add set name=pkg.human-version value="${human_readable_version}"
@@ -243,7 +243,9 @@ then
243243
rm -f ${PKG_NAME}-${human_readable_version}.p5p
244244
fi
245245

246-
PKG pkgrecv -s "$PKG_REPO_NAME" -a -d ./dist/${PKG_NAME}-${human_readable_version}.p5p ${PKG_NAME}
246+
outfile="$PWD/dist/${PKG_NAME}-${human_readable_version}.p5p"
247+
rm -f "${outfile}"
248+
PKG pkgrecv -s "$PKG_REPO_NAME" -a -d "${outfile}" ${PKG_NAME}
247249

248250
# cleanup
249251
if [ -d "$PKG_REPO_NAME" ]
@@ -254,6 +256,5 @@ fi
254256
unset PKG_REPO
255257

256258
echo "SUCCESSFULLY COMPLETED"
257-
echo "OpenGrok has been packaged into $(pwd)/dist/opengrok-${human_readable_version}.p5p"
259+
echo "OpenGrok has been packaged into $outfile"
258260
echo "For more information about installing OpenGrok visit pkg man page."
259-

0 commit comments

Comments
 (0)