diff options
| author | Chris Johns <chrisj@rtems.org> | 2017-04-12 21:53:02 +1000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2017-04-12 21:53:02 +1000 |
| commit | fd5559fa20f1086acfeff62ea76d8b0d00862452 (patch) | |
| tree | 51b0e4c2f6cecafdafc273a099d83c705d69f3fb | |
| parent | Limit the doxygen dot threads it runs. (diff) | |
| download | rtems-release-fd5559fa20f1086acfeff62ea76d8b0d00862452.tar.bz2 | |
Fix the compression bugs. Clean if present.
| -rwxr-xr-x | rtems-release-defaults | 2 | ||||
| -rwxr-xr-x | rtems-release-package | 4 | ||||
| -rwxr-xr-x | rtems-release-sources | 8 |
3 files changed, 9 insertions, 5 deletions
diff --git a/rtems-release-defaults b/rtems-release-defaults index 6fcf328..9be04bb 100755 --- a/rtems-release-defaults +++ b/rtems-release-defaults @@ -50,7 +50,7 @@ checksum=sha512 # # Default compression and options plus file suffix. # -comp=xz --threads=0 +comp="xz --threads=0" comp_ext=xz comp_tar=J diff --git a/rtems-release-package b/rtems-release-package index 26e387d..a405236 100755 --- a/rtems-release-package +++ b/rtems-release-package @@ -95,14 +95,14 @@ if [ ! -f ${stamped_tar}.tar ]; then echo "error: git archive failed, no tar file" exit 1 fi -echo "tar Jxf ${stamped_tar}.tar" +echo "tar xf ${stamped_tar}.tar" tar Jxf ${stamped_tar}.tar if [ -n "${git_submodules}" ]; then for s in ${git_submodules} do ok=$(echo ${git_submodules_excludes} | sed -e "s/.*${s}.*/no/g") if [ "${ok}" != "no" ]; then - echo "tar Jxf ${stamped_tar}-${s}.tar" + echo "tar xf ${stamped_tar}-${s}.tar" tar Jxf ${stamped_tar}-${s}.tar fi done diff --git a/rtems-release-sources b/rtems-release-sources index 39b3c40..e93739d 100755 --- a/rtems-release-sources +++ b/rtems-release-sources @@ -128,7 +128,9 @@ cd ${release} # for d in git svn cvs do - find sources/${d} -type d -empty -delete + if [ -e sources/${d} ]; then + find sources/${d} -type d -empty -delete + fi done # # If git, svn or cvs exist the release fails. @@ -158,7 +160,9 @@ cd ${release} # for d in git svn cvs do - find sources/${d} -type d -empty -delete + if [ -e sources/${d} ]; then + find sources/${d} -type d -empty -delete + fi done # # If svn or cvs exist the release fails. Git is ok. |