build_haiku_package: Print some progress info
Remove the output in extractFile(), though. The extracted packages are so small that it doesn't matter anymore.
This commit is contained in:
@@ -38,6 +38,8 @@ eval "$addBuildCompatibilityLibDir"
|
|||||||
|
|
||||||
|
|
||||||
# make a clean contents dir
|
# make a clean contents dir
|
||||||
|
packageName=`basename "$packagePath"`
|
||||||
|
echo "$packageName: Removing and re-creating package contents dir ..."
|
||||||
contentsDir="$tmpDir/contents"
|
contentsDir="$tmpDir/contents"
|
||||||
$rmAttrs -rf "$contentsDir"
|
$rmAttrs -rf "$contentsDir"
|
||||||
mkdir -p "$contentsDir"
|
mkdir -p "$contentsDir"
|
||||||
@@ -71,15 +73,12 @@ extractFile()
|
|||||||
|
|
||||||
case "$archiveFile" in
|
case "$archiveFile" in
|
||||||
*.zip)
|
*.zip)
|
||||||
echo "Extracting $archiveFile ..."
|
|
||||||
$unzip -q -d "$extractDir" "$archiveFile"
|
$unzip -q -d "$extractDir" "$archiveFile"
|
||||||
;;
|
;;
|
||||||
*.tgz|*.tar.gz)
|
*.tgz|*.tar.gz)
|
||||||
echo "Extracting $archiveFile ..."
|
|
||||||
tar -C "$extractDir" -xf "$archiveFile"
|
tar -C "$extractDir" -xf "$archiveFile"
|
||||||
;;
|
;;
|
||||||
*.hpkg)
|
*.hpkg)
|
||||||
echo "Extracting $archiveFile ..."
|
|
||||||
if [ -n "$extractedSubDir" ]; then
|
if [ -n "$extractedSubDir" ]; then
|
||||||
$package extract -C "$extractDir" "$archiveFile" \
|
$package extract -C "$extractDir" "$archiveFile" \
|
||||||
"$extractedSubDir"
|
"$extractedSubDir"
|
||||||
@@ -102,6 +101,7 @@ extractFile()
|
|||||||
|
|
||||||
|
|
||||||
# execute the scripts preparing the package contents
|
# execute the scripts preparing the package contents
|
||||||
|
echo "$packageName: Collecting package contents ..."
|
||||||
while [ $# -gt 0 ]; do
|
while [ $# -gt 0 ]; do
|
||||||
. $1
|
. $1
|
||||||
shift
|
shift
|
||||||
@@ -109,15 +109,18 @@ done
|
|||||||
|
|
||||||
|
|
||||||
# mimeset the whole package content
|
# mimeset the whole package content
|
||||||
|
echo "$packageName: mimeset'ing package contents ..."
|
||||||
$mimeset --mimedb "$mimeDB" "$contentsDir"
|
$mimeset --mimedb "$mimeDB" "$contentsDir"
|
||||||
|
|
||||||
|
|
||||||
# create the package
|
# create the package
|
||||||
if [ ! $updateOnly ]; then
|
if [ ! $updateOnly ]; then
|
||||||
|
echo "$packageName: Creating the package ..."
|
||||||
rm -f "$packagePath"
|
rm -f "$packagePath"
|
||||||
$package create -q "-$compressionLevel" -i "$packageInfoPath" \
|
$package create -q "-$compressionLevel" -i "$packageInfoPath" \
|
||||||
-C "$contentsDir" "$packagePath"
|
-C "$contentsDir" "$packagePath"
|
||||||
else
|
else
|
||||||
|
echo "$packageName: Updating the package ..."
|
||||||
$package add -q -f "-$compressionLevel" -i "$packageInfoPath" \
|
$package add -q -f "-$compressionLevel" -i "$packageInfoPath" \
|
||||||
-C "$contentsDir" "$packagePath" .
|
-C "$contentsDir" "$packagePath" .
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user