equal
deleted
inserted
replaced
21 |
21 |
22 rm -f /tmp/.build_env.$$ |
22 rm -f /tmp/.build_env.$$ |
23 [ -z "$PKGDEST" ] || echo "export PKGDEST=$PKGDEST" >> /tmp/.build_env.$$ |
23 [ -z "$PKGDEST" ] || echo "export PKGDEST=$PKGDEST" >> /tmp/.build_env.$$ |
24 [ -z "$IPS_VENDORVER" ] || echo "export IPS_VENDORVER=$IPS_VENDORVER" >> /tmp/.build_env.$$ |
24 [ -z "$IPS_VENDORVER" ] || echo "export IPS_VENDORVER=$IPS_VENDORVER" >> /tmp/.build_env.$$ |
25 [ -z "$PUBLISHER" ] || echo "export PUBLISHER=$PUBLISHER" >> /tmp/.build_env.$$ |
25 [ -z "$PUBLISHER" ] || echo "export PUBLISHER=$PUBLISHER" >> /tmp/.build_env.$$ |
|
26 [ -z "$DOWNLOADS" ] || echo "export DOWNLOADS=$DOWNLOADS" >> /tmp/.build_env.$$ |
26 |
27 |
27 source /opt/jdsbld/bin/env.sh |
28 source /opt/jdsbld/bin/env.sh |
28 |
29 |
29 . /tmp/.build_env.$$ |
30 . /tmp/.build_env.$$ |
30 |
31 |
125 PKGBUILDARGS="$CMD --nonotify --download --topdir=$BLDDIR --specdirs=$SPECDIRS " |
126 PKGBUILDARGS="$CMD --nonotify --download --topdir=$BLDDIR --specdirs=$SPECDIRS " |
126 PKGBUILDARGS="$PKGBUILDARGS --sourcedirs=$SRCDIRS --patchdirs=$PATCHDIRS" |
127 PKGBUILDARGS="$PKGBUILDARGS --sourcedirs=$SRCDIRS --patchdirs=$PATCHDIRS" |
127 PKGBUILDARGS="$PKGBUILDARGS --logdir=$BLDDIR/log" |
128 PKGBUILDARGS="$PKGBUILDARGS --logdir=$BLDDIR/log" |
128 PKGBUILDARGS="$PKGBUILDARGS --pkgformat=ips" |
129 PKGBUILDARGS="$PKGBUILDARGS --pkgformat=ips" |
129 |
130 |
|
131 [[ -z "$DOWNLOADS" ]] || PKGBUILDARGS+=" --tar=$DOWNLOADS" |
|
132 |
130 if [ $CMD = 'build' ]; then |
133 if [ $CMD = 'build' ]; then |
131 echo "pkgtool $PKGUNINSTALLARGS $spec" |
134 echo "pkgtool $PKGUNINSTALLARGS $spec" |
132 $PKGTOOL $PKGUNINSTALLARGS $spec |
135 $PKGTOOL $PKGUNINSTALLARGS $spec |
133 fi |
136 fi |
134 echo "$PKGTOOL $PKGBUILDARGS --define \"ipsvendorver $IPS_VENDORVER\" $spec" |
137 echo "$PKGTOOL $PKGBUILDARGS --define \"ipsvendorver $IPS_VENDORVER\" $spec" |