Simplify formatting of the manifest

This commit is contained in:
root 2012-11-07 07:21:51 +09:00
parent 181bf7f38b
commit b54768df01

View file

@ -84,7 +84,6 @@ splitcolon()
setvar "$2" "${1%%:*}" setvar "$2" "${1%%:*}"
setvar "$3" "${1#*:}" setvar "$3" "${1#*:}"
} }
repoidstr() { xecho "repo $Repoid"; }
## gitception part ## gitception part
# Fetch giturl $1, file $2 # Fetch giturl $1, file $2
@ -718,9 +717,13 @@ EOF
TmpManifest_Enc="$Localdir/tmp_manifest.$$" TmpManifest_Enc="$Localdir/tmp_manifest.$$"
(xecho "$Branchlist"; xecho "$Packlist"; xecho "$Keeplist"; PRIVENCRYPT "$Recipients" > "$TmpManifest_Enc" <<EOF
repoidstr; xecho "$Extension_list") | $Branchlist
PRIVENCRYPT "$Recipients" > "$TmpManifest_Enc" $Packlist
$Keeplist
repo $Repoid
$Extension_list
EOF
# Upload pack # Upload pack
if [ -s "$TmpObjlist" ] if [ -s "$TmpObjlist" ]