OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-tools Date: 24-Oct-2006 12:40:09 Branch: HEAD Handle: 2006102411400900 Modified files: openpkg-tools/cmd dev.sh Log: subshells require cvs shell function escaping, also modify two similar occurrences for consistency Summary: Revision Changes Path 1.88 +5 -5 openpkg-tools/cmd/dev.sh ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-tools/cmd/dev.sh ============================================================================ $ cvs diff -u -r1.87 -r1.88 dev.sh --- openpkg-tools/cmd/dev.sh 24 Oct 2006 10:23:11 -0000 1.87 +++ openpkg-tools/cmd/dev.sh 24 Oct 2006 10:40:09 -0000 1.88 @@ -1887,7 +1887,7 @@ if [ ${bundle} -eq 1 ]; then bundle_files="${bundle_files} ${files}" elif [ ${dry} -eq 0 ]; then - ( builtin cd ${OPENPKG_WORK}/$S && cvs commit -F "${msg}" $files ) + ( builtin cd ${OPENPKG_WORK}/$S && command cvs commit -F "${msg}" $files ) else echo cvs commit -F "${msg}" $files ( builtin cd ${OPENPKG_WORK}/$S && cvs diff $files | ${cvs_diff_colorize} ) @@ -1896,7 +1896,7 @@ if [ ${bundle} -eq 1 ]; then bundle_files="${bundle_files} ${files}" elif [ ${dry} -eq 0 ]; then - ( builtin cd ${OPENPKG_WORK}/$S && cvs commit $files ) + ( builtin cd ${OPENPKG_WORK}/$S && command cvs commit $files ) else echo cvs commit $files ( builtin cd ${OPENPKG_WORK}/$S && cvs diff $files | ${cvs_diff_colorize} ) @@ -1905,7 +1905,7 @@ if [ ${bundle} -eq 1 ]; then bundle_files="${bundle_files} ${files}" elif [ ${dry} -eq 0 ]; then - ( builtin cd ${OPENPKG_WORK}/$S && cvs commit -m "${msg}" $files ) + ( builtin cd ${OPENPKG_WORK}/$S && command cvs commit -m "${msg}" $files ) else echo cvs commit -m "${msg}" $files ( builtin cd ${OPENPKG_WORK}/$S && cvs diff $files | ${cvs_diff_colorize} ) @@ -1952,14 +1952,14 @@ echo "rm ${bundle_wipes}" | sftp $uath fi scp -o "Compression no" -o "Cipher blowfish" ${bundle_srpms} ${OPENPKG_SAVE}/${upload}/ - eval "builtin cd ${OPENPKG_WORK}/$S && cvs commit ${bundle_msg} ${bundle_files}" + eval "builtin cd ${OPENPKG_WORK}/$S && command cvs commit ${bundle_msg} ${bundle_files}" else echo chmod 664 ${bundle_srpms} if [ ".${bundle_wipes}" != . ]; then echo "echo \"rm ${bundle_wipes}\" | sftp $uath" fi echo "scp -o \"Compression no\" -o \"Cipher blowfish\" ${bundle_srpms} ${OPENPKG_SAVE}/${upload}/" - echo "builtin cd ${OPENPKG_WORK}/$S && cvs commit ${bundle_msg} ${bundle_files}" + echo "builtin cd ${OPENPKG_WORK}/$S && command cvs commit ${bundle_msg} ${bundle_files}" ( builtin cd ${OPENPKG_WORK}/$S && cvs diff ${bundle_files} | ${cvs_diff_colorize} ) fi fi @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org