Commit 589276e7 authored by Mark OLESEN's avatar Mark OLESEN
Browse files

CONFIG: add -no-patch option for foamPackRelease

- if desired to create a tar-file without a _patch value in its name.
parent 995cffcb
...@@ -48,6 +48,7 @@ Usage: ${0##*/} [OPTION] commit-ish ...@@ -48,6 +48,7 @@ Usage: ${0##*/} [OPTION] commit-ish
options: options:
-output DIR Specify alternative output directory -output DIR Specify alternative output directory
-no-modules Exclude submodules -no-modules Exclude submodules
-no-patch Ignore _patch number for the output tar-file
-compress=TYPE Compress with specified type -compress=TYPE Compress with specified type
-tgz Alias for -compress=tgz -tgz Alias for -compress=tgz
-help Print help -help Print help
...@@ -79,7 +80,7 @@ die() ...@@ -79,7 +80,7 @@ die()
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
outputDir="." outputDir="."
withModules=true unset skipModules skipPatchNum
unset gitbase head commit compress unset gitbase head commit compress
while [ "$#" -gt 0 ] while [ "$#" -gt 0 ]
...@@ -94,7 +95,10 @@ do ...@@ -94,7 +95,10 @@ do
shift shift
;; ;;
-no-modules) -no-modules)
unset withModules skipModules=true
;;
-no-patch)
skipPatchNum=true
;; ;;
-compress=*) -compress=*)
compress="${1#*=}" compress="${1#*=}"
...@@ -187,9 +191,12 @@ echo "Detected api, patch as '$api' and '$patch'" 1>&2 ...@@ -187,9 +191,12 @@ echo "Detected api, patch as '$api' and '$patch'" 1>&2
dirPrefix="OpenFOAM-v${api}" dirPrefix="OpenFOAM-v${api}"
tarName="OpenFOAM-v${api}" tarName="OpenFOAM-v${api}"
if [ "${patch:-0}" -gt 0 ] if [ "$skipPatchNum" = true ]
then
echo "Ignoring patch number for output name" 1>&2
elif [ "${patch:-0}" -gt 0 ]
then then
tarName="${tarName}_$patch" tarName="${tarName}_${patch}"
fi fi
echo 1>&2 echo 1>&2
...@@ -224,7 +231,7 @@ echo 'git ls-tree -r "$head" >> "$outputDir/$manifest"' ...@@ -224,7 +231,7 @@ echo 'git ls-tree -r "$head" >> "$outputDir/$manifest"'
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Add in mpdules # Add in mpdules
if [ "$withModules" = true ] if [ "$skipModules" != true ]
then then
git --git-dir="$gitbase/.git" ls-tree "$head" modules/ | \ git --git-dir="$gitbase/.git" ls-tree "$head" modules/ | \
while read mode gittype sha1 module while read mode gittype sha1 module
...@@ -249,7 +256,7 @@ then ...@@ -249,7 +256,7 @@ then
echo 'tar -Af "$outputDir/$tarName.tar" "$outputDir/$tarModule.tar"' echo 'tar -Af "$outputDir/$tarName.tar" "$outputDir/$tarModule.tar"'
echo 'rm -f "$outputDir/$tarModule.tar"' echo 'rm -f "$outputDir/$tarModule.tar"'
echo "popd" echo 'popd'
echo echo
done done
fi fi
...@@ -263,7 +270,7 @@ echo "echo 'Adding manifest'" ...@@ -263,7 +270,7 @@ echo "echo 'Adding manifest'"
echo 'pushd "$outputDir"' echo 'pushd "$outputDir"'
echo "tar --append --transform='s|@|/|g' -v -f \"\$tarName.tar\" \"\$manifest\"" echo "tar --append --transform='s|@|/|g' -v -f \"\$tarName.tar\" \"\$manifest\""
echo 'rm -f "$manifest"' echo 'rm -f "$manifest"'
echo "popd" echo 'popd'
echo echo
echo "# End of creating archive" echo "# End of creating archive"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment