diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2e3055f951..fcfa372ac2 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,13 @@ The license applies to all entries newer than 2009-04-28. */ +2010-07-26 21:17 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * bin/hb-func.sh + - Deleted one more now unused function. + + * config/postinst.hbs + ! Fix to prev. + 2010-07-26 20:43 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * debian/rules * harbour.spec diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh index ad46c012c0..3cdcedb1ca 100755 --- a/harbour/bin/hb-func.sh +++ b/harbour/bin/hb-func.sh @@ -11,32 +11,6 @@ # See COPYING for licensing terms. # --------------------------------------------------------------- -get_hbplatform() -{ - if [ "$OSTYPE" = "msdosdjgpp" ]; then - id="djgpp" - else - # please add your distro suffix if it not belong to the one recognized below - # and remember that order checking can be important - [ "${id}" = "" ] && id=`rel=$(rpm -q --queryformat='.%{VERSION}' mandriva-release-One 2>/dev/null) && echo "mdk$rel"|tr -d "."` - [ "${id}" = "" ] && id=`rel=$(rpm -q --queryformat='.%{VERSION}' mandriva-release 2>/dev/null) && echo "mdk$rel"|tr -d "."` - [ "${id}" = "" ] && id=`rel=$(rpm -q --queryformat='.%{VERSION}' mandrake-release 2>/dev/null) && echo "mdk$rel"|tr -d "."` - [ "${id}" = "" ] && id=`rel=$(rpm -q --queryformat='.%{VERSION}' redhat-release 2>/dev/null) && echo "rh$rel"|tr -d "."` - [ "${id}" = "" ] && id=`rel=$(rpm -q --queryformat='.%{VERSION}' fedora-release 2>/dev/null) && echo "fc$rel"|tr -d "."` - [ "${id}" = "" ] && id=`rel=$(rpm -q --queryformat='.%{VERSION}' suse-release 2>/dev/null) && echo "sus$rel"|tr -d "."` - [ "${id}" = "" ] && id=`rel=$(rpm -q --queryformat='.%{VERSION}' openSUSE-release 2>/dev/null) && echo "sus$rel"|tr -d "."` - [ "${id}" = "" ] && id=`rel=$(rpm -q --queryformat='.%{VERSION}' conectiva-release 2>/dev/null) && echo "cl$rel"|tr -d "."` - [ "${id}" = "" ] && id=`rel=$(rpm -q --queryformat='.%{VERSION}' aurox-release 2>/dev/null) && echo "cl$rel"|tr -d "."` - [ "${id}" = "" ] && id=`[ -f /etc/pld-release ] && cat /etc/pld-release|sed -e '/1/ !d' -e 's/[^0-9]//g' -e 's/^/pld/'` - [ "${id}" = "" ] && id=`uname -s | tr '[ A-Z]' '[_a-z]'` - case "${id}" in - mingw*) id="mingw" ;; - *) ;; - esac - fi - echo "${id}" -} - get_hbver() { hb_rootdir="${1-.}" diff --git a/harbour/config/postinst.hbs b/harbour/config/postinst.hbs index e626dcb9f4..c29a01b689 100644 --- a/harbour/config/postinst.hbs +++ b/harbour/config/postinst.hbs @@ -230,7 +230,7 @@ PROCEDURE Main() cSH_Script += 'exit \$?' cSH_Script += 'HB_INST_EOF' - hb_MemoWrite( tmp, cSH_Script ) + hb_MemoWrite( tmp, cSH_Script + hb_MemoRead( cTar_Path ) ) hb_FGetAttr( tmp, @nAttr ) hb_FSetAttr( tmp, hb_bitOr( nAttr, HB_FA_XOTH ) )