--- freem/scripts/fmd-commit 2025/04/04 18:00:01 1.1 +++ freem/scripts/fmd-commit 2025/04/06 03:38:05 1.4 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -# $Id: fmd-commit,v 1.1 2025/04/04 18:00:01 snw Exp $ +# $Id: fmd-commit,v 1.4 2025/04/06 03:38:05 snw Exp $ # Commit to FreeM repository # # @@ -25,6 +25,15 @@ # along with FreeM. If not, see . # # $Log: fmd-commit,v $ +# Revision 1.4 2025/04/06 03:38:05 snw +# Prepare for adding packaging functionality to fmd +# +# Revision 1.3 2025/04/04 18:19:13 snw +# Fix fmd-commit call to fmd log +# +# Revision 1.2 2025/04/04 18:14:56 snw +# Fix log and commit scripts +# # Revision 1.1 2025/04/04 18:00:01 snw # *** empty log message *** # @@ -34,10 +43,27 @@ # function usage() { - echo "usage: fmd commit " - exit 1 + echo + echo "Commits your changes to the FreeM CVS repository" + echo + echo "usage:" + echo + echo " fmd commit \"\"" + echo + echo " should describe what this change does." + echo + echo "NOTE: the commit message will be added to the ChangeLog" + echo " prior to committing the repository." + echo + exit 0 } +if [[ $1 == "help" ]] +then + usage +fi + + if [[ $# == 0 ]] then echo "commit: must be run from 'fmd commit'" @@ -55,8 +81,18 @@ then usage fi -COMMIT_MSG=$2 +FMD="$1" +COMMIT_MESSAGE="$2" + +OLD_CVS_RSH="${CVS_RSH}" +OLD_CVSROOT="${CVSROOT}" + +export CVSROOT=":ext:${_fmd_cvsuser}@cvs.coherent-logic.com:/home/cvsroot" +export CVS_RSH="$(which ssh)" ${FMD} log "${COMMIT_MESSAGE}" cvs ci -m "${COMMIT_MESSAGE}" +export CVSROOT="${OLD_CVSROOT}" +export CVS_RSH="${OLD_CVS_RSH}" +