--- trunk/pkgtools/svn-revup.sh 2013/01/03 09:59:47 2013 +++ trunk/pkgtools/svn-revup.sh 2013/01/03 10:00:19 2014 @@ -5,8 +5,10 @@ # fake sminclude() { true; } -SVNCOMMIT="true" +SVNCOMMIT="false" DELETEOLD="true" +OPENINEDITOR="true" +DEFAULTEDITOR="geany" SMAGEFILE="$1" [[ -z ${SMAGEFILE} ]] && die "No smage2 file given" @@ -30,26 +32,37 @@ cp ${BASEDIR}md5/${BASEMD5} ${BASEDIR}md5/${BASEMD5/-${PBUILD}./-${newpbuild}.} fi -if [[ ${SVNCOMMIT} = true ]] -then - COMMITLINE="" +COMMITLINE="" - if [[ ${DELETEOLD} = true ]] - then - svn del ${SMAGEFILE} || die - COMMITLINE="${COMMITLINE} ${SMAGEFILE}" - if [[ ${HAVEMD5} = yes ]] - then - svn del ${BASEDIR}/md5/${BASEMD5} || die - COMMITLINE="${COMMITLINE} ${BASEDIR}/md5/${BASEMD5}" - fi - fi +if [[ ${DELETEOLD} = true ]] +then + svn del ${SMAGEFILE} || die + COMMITLINE="${COMMITLINE} ${SMAGEFILE}" if [[ ${HAVEMD5} = yes ]] then - svn add ${BASEDIR}md5/${BASEMD5/-${PBUILD}./-${newpbuild}.} || die - COMMITLINE="${COMMITLINE} ${BASEDIR}md5/${BASEMD5/-${PBUILD}./-${newpbuild}.}" + svn del ${BASEDIR}/md5/${BASEMD5} || die + COMMITLINE="${COMMITLINE} ${BASEDIR}/md5/${BASEMD5}" fi - svn add ${BASEDIR}${BASEFILE/-${PBUILD}./-${newpbuild}.} || die +fi +if [[ ${HAVEMD5} = yes ]] +then + svn add ${BASEDIR}md5/${BASEMD5/-${PBUILD}./-${newpbuild}.} || die + COMMITLINE="${COMMITLINE} ${BASEDIR}md5/${BASEMD5/-${PBUILD}./-${newpbuild}.}" +fi +svn add ${BASEDIR}${BASEFILE/-${PBUILD}./-${newpbuild}.} || die + +if [[ ${SVNCOMMIT} = true ]] +then COMMITLINE="${COMMITLINE} ${BASEDIR}${BASEFILE/-${PBUILD}./-${newpbuild}.}" svn commit -m "${MESSAGE}" ${COMMITLINE} || die fi + +if [[ ${OPENINEDITOR} = true ]] +then + if [[ ! -x $(type -P ${DEFAULTEDITOR}) ]] + then + DEFAULTEDITOR="nano -w" + fi + + ${DEFAULTEDITOR} ${BASEDIR}${BASEFILE/-${PBUILD}./-${newpbuild}.} +fi