diff --git a/harbour/ChangeLog b/harbour/ChangeLog index a3435b81ad..4eae22b11d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,19 @@ The license applies to all entries newer than 2009-04-28. */ +2010-06-15 10:58 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbcurl/hbcurl.c + ! Fixed typo in prev change. + + * mpkg_deb.sh + * mpkg_rpm.sh + * mpkg_rpm_from_svn.sh + * mpkg_rpm_win.sh + * mpkg_rpm_wce.sh + * bin/hb-mkdyn.sh + * bin/postinst.sh + + More POSIX compatibility changes by Tamas Tevesz. + 2010-06-14 21:38 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + contrib/hbqt/qth/HBQSyntaxHighlighter.qth + Readded after case conversion. @@ -34,9 +47,9 @@ * contrib/hbide/idedocks.prg * contrib/hbide/idestylesheets.prg % Prepared to apply ideThemes ( upcoming ) if user so defines. - A glimpse can be had from . - Current theme is Microsoft Office look and feel, though a - little more work is required. RGB Colors supplied by + A glimpse can be had from . + Current theme is Microsoft Office look and feel, though a + little more work is required. RGB Colors supplied by Antonio Linares. 2010-06-15 03:36 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) diff --git a/harbour/bin/hb-mkdyn.sh b/harbour/bin/hb-mkdyn.sh index 96d5c4b34e..1609c73722 100755 --- a/harbour/bin/hb-mkdyn.sh +++ b/harbour/bin/hb-mkdyn.sh @@ -77,7 +77,7 @@ cleanup() [ -z "${OTMPDIR}" ] || rm -fR "${OTMPDIR}" } -trap cleanup EXIT &>/dev/null +trap cleanup EXIT >/dev/null 2>&1 if [ "${SLIB_EXT}" != ".dylib" ]; then diff --git a/harbour/bin/postinst.sh b/harbour/bin/postinst.sh index 015b5a8317..4b652fb0be 100755 --- a/harbour/bin/postinst.sh +++ b/harbour/bin/postinst.sh @@ -300,7 +300,7 @@ then chmod 755 "${hb_mkdyn}" elif [ "${HB_PLATFORM}" = "sunos" ] || \ [ "${HB_PLATFORM}" = "hpux" ] || \ - ! which install &>/dev/null; then + ! which install >/dev/null 2>&1; then hb_mkdyn="${HB_INST_PKGPREF}${HB_BIN_INSTALL}/hb-mkdyn" rm -f "${hb_mkdyn}" cp "${hb_root}/bin/hb-mkdyn.sh" "${hb_mkdyn}" && \ diff --git a/harbour/contrib/hbcurl/hbcurl.c b/harbour/contrib/hbcurl/hbcurl.c index d053df6a18..092956d9eb 100644 --- a/harbour/contrib/hbcurl/hbcurl.c +++ b/harbour/contrib/hbcurl/hbcurl.c @@ -1451,7 +1451,7 @@ HB_FUNC( CURL_EASY_SETOPT ) { hb_curl_file_ul_free( hb_curl ); - if( HB_ISNUMBER( 3 ) ) + if( HB_ISNUM( 3 ) ) { hb_curl->ul_name = NULL; hb_curl->ul_handle = hb_numToHandle( hb_parnint( 3 ) ); @@ -1486,7 +1486,7 @@ HB_FUNC( CURL_EASY_SETOPT ) { hb_curl_file_dl_free( hb_curl ); - if( HB_ISNUMBER( 3 ) ) + if( HB_ISNUM( 3 ) ) { hb_curl->dl_name = NULL; hb_curl->dl_handle = hb_numToHandle( hb_parnint( 3 ) ); diff --git a/harbour/mpkg_deb.sh b/harbour/mpkg_deb.sh index dc59873af7..3e932d0656 100755 --- a/harbour/mpkg_deb.sh +++ b/harbour/mpkg_deb.sh @@ -12,7 +12,7 @@ test_reqpkg() { - dpkg -l "$1" 2> /dev/null | grep '^ii' &> /dev/null + dpkg -l "$1" 2>/dev/null | grep '^ii' >/dev/null 2>&1 status="$?" if [ -n "$2" ] && [ $status -eq 0 ] then diff --git a/harbour/mpkg_rpm.sh b/harbour/mpkg_rpm.sh index c8f3087e80..e45d1de3c1 100755 --- a/harbour/mpkg_rpm.sh +++ b/harbour/mpkg_rpm.sh @@ -12,7 +12,7 @@ test_reqrpm() { - rpm -q --whatprovides "$1" &> /dev/null + rpm -q --whatprovides "$1" >/dev/null 2>&1 } get_rpmmacro() @@ -187,7 +187,7 @@ then cp ${hb_filename} ${RPMDIR}/SOURCES cp harbour.spec ${RPMDIR}/SPECS fi - if which rpmbuild &>/dev/null + if which rpmbuild >/dev/null 2>&1 then RPMBLD="rpmbuild" else diff --git a/harbour/mpkg_rpm_from_svn.sh b/harbour/mpkg_rpm_from_svn.sh index 20f02b2e3f..3b7d51a426 100755 --- a/harbour/mpkg_rpm_from_svn.sh +++ b/harbour/mpkg_rpm_from_svn.sh @@ -18,7 +18,7 @@ export PROJECT=harbour test_reqrpm() { - rpm -q --whatprovides "$1" &> /dev/null + rpm -q --whatprovides "$1" >/dev/null 2>&1 } TOINST_LST="" diff --git a/harbour/mpkg_rpm_wce.sh b/harbour/mpkg_rpm_wce.sh index c2fa29f54c..c02ee300ec 100755 --- a/harbour/mpkg_rpm_wce.sh +++ b/harbour/mpkg_rpm_wce.sh @@ -12,7 +12,7 @@ test_reqrpm() { - rpm -q --whatprovides "$1" &> /dev/null + rpm -q --whatprovides "$1" >/dev/null 2>&1 } get_rpmmacro() @@ -91,7 +91,7 @@ then sed -e "s/^%define version .*$/%define version ${hb_ver}/g" \ -e "s/^%define releasen .*$/%define releasen ${hb_verstat}/g" \ harbour-wce-spec > ${RPMDIR}/SPECS/harbour-wce.spec - if which rpmbuild &>/dev/null + if which rpmbuild >/dev/null 2>&1 then RPMBLD="rpmbuild" else diff --git a/harbour/mpkg_rpm_win.sh b/harbour/mpkg_rpm_win.sh index c060bc3be6..27739cc9ea 100755 --- a/harbour/mpkg_rpm_win.sh +++ b/harbour/mpkg_rpm_win.sh @@ -12,7 +12,7 @@ test_reqrpm() { - rpm -q --whatprovides "$1" &> /dev/null + rpm -q --whatprovides "$1" >/dev/null 2>&1 } get_rpmmacro() @@ -115,7 +115,7 @@ then -e "s|^%define hb_ccpath .*$|%define hb_ccpath ${HB_CCPATH}|g" \ -e "s|^%define hb_ccpref .*$|%define hb_ccpref ${HB_CCPREFIX}|g" \ harbour-win-spec > ${RPMDIR}/SPECS/harbour-win.spec - if which rpmbuild &>/dev/null + if which rpmbuild >/dev/null 2>&1 then RPMBLD="rpmbuild" else