--- freem/scripts/fmd-pkg-rpm 2025/04/07 13:02:51 1.3 +++ freem/scripts/fmd-pkg-rpm 2025/04/07 21:50:11 1.4 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -# $Id: fmd-pkg-rpm,v 1.3 2025/04/07 13:02:51 snw Exp $ +# $Id: fmd-pkg-rpm,v 1.4 2025/04/07 21:50:11 snw Exp $ # Creates an rpm package # # @@ -25,6 +25,9 @@ # along with FreeM. If not, see . # # $Log: fmd-pkg-rpm,v $ +# Revision 1.4 2025/04/07 21:50:11 snw +# Fix bug in fmd-pkg-rpm +# # Revision 1.3 2025/04/07 13:02:51 snw # Initial working version of fmd-pkg-rpm # @@ -97,28 +100,28 @@ else echo "[OK]" fi -echo -n "${PGM}: cleaning up..." -rm -rf "${OLD_DIR}" "${NEW_DIR}" "${NEW_TARBALL}" &>> /dev/null -if [[ $? != 0 ]] +if [[ "${ORIG_TARBALL}" != "${NEW_TARBALL}" ]] then - echo "[FAIL]" - exit 1 + RENAME=1 else - echo "[OK]" + RENAME=0 fi -echo -n "${PGM}: decompressing source tarball..." -tar xzf "${ORIG_TARBALL}" -if [[ $? != 0 ]] +if [[ $RENAME == 1 ]] then - echo "[FAIL]" - exit 1 -else - echo "[OK]" + echo -n "${PGM}: cleaning up..." + rm -rf "${OLD_DIR}" "${NEW_DIR}" "${NEW_TARBALL}" &>> /dev/null + if [[ $? != 0 ]] + then + echo "[FAIL]" + exit 1 + else + echo "[OK]" + fi fi -echo -n "${PGM}: renaming ${ORIG_DIR} -> ${NEW_DIR}..." -mv "${ORIG_DIR}" "${NEW_DIR}" &>> /dev/null +echo -n "${PGM}: decompressing source tarball..." +tar xzf "${ORIG_TARBALL}" if [[ $? != 0 ]] then echo "[FAIL]" @@ -127,16 +130,29 @@ else echo "[OK]" fi -echo -n "${PGM}: generating ${NEW_TARBALL}..." -tar cf "${NEW_TARBALL}" "${NEW_DIR}" &>> /dev/null -if [[ $? != 0 ]] +if [[ $RENAME == 1 ]] then - echo "[FAIL]" - exit 1 -else - echo "[OK]" -fi + echo -n "${PGM}: renaming ${ORIG_DIR} -> ${NEW_DIR}..." + mv "${ORIG_DIR}" "${NEW_DIR}" &>> /dev/null + if [[ $? != 0 ]] + then + echo "[FAIL]" + exit 1 + else + echo "[OK]" + fi + + echo -n "${PGM}: generating ${NEW_TARBALL}..." + tar cf "${NEW_TARBALL}" "${NEW_DIR}" &>> /dev/null + if [[ $? != 0 ]] + then + echo "[FAIL]" + exit 1 + else + echo "[OK]" + fi +fi echo -n "${PGM}: uploading source tarball..." scp "${NEW_TARBALL}" jpw@freem.coherent-logic.com://var/www/freem.coherent-logic.com/downloads/ &>> "${LOGFILE}"