Changeset View
Changeset View
Standalone View
Standalone View
security/rkhunter/files/patch-installer.sh
| --- ./installer.sh.orig 2012-04-27 00:10:12.000000000 +0200 | --- installer.sh.orig 2014-02-24 02:37:15 UTC | ||||
| +++ ./installer.sh 2012-07-03 23:56:30.000000000 +0200 | +++ installer.sh | ||||
| @@ -392,7 +392,7 @@ | @@ -392,7 +392,7 @@ selectTemplate() { # Take input from the "--install pa | ||||
| RKHINST_ETC_DIR="${SYSCONFIGDIR}" | RKHINST_ETC_DIR="${SYSCONFIGDIR}" | ||||
| RKHINST_BIN_DIR="${BINDIR}" | RKHINST_BIN_DIR="${BINDIR}" | ||||
| RKHINST_SCRIPT_DIR="${LIBDIR}/${APPNAME}/scripts" | RKHINST_SCRIPT_DIR="${LIBDIR}/${APPNAME}/scripts" | ||||
| - RKHINST_MAN_DIR="${SHAREDIR}/man/man8" | - RKHINST_MAN_DIR="${SHAREDIR}/man/man8" | ||||
| + RKHINST_MAN_DIR="${PREFIX}/man/man8" | + RKHINST_MAN_DIR="${PREFIX}/man/man8" | ||||
| if [ "${RKHINST_LAYOUT}" = "oldschool" ]; then | if [ "${RKHINST_LAYOUT}" = "oldschool" ]; then | ||||
| RKHINST_DB_DIR="${VARDIR}/${APPNAME}/db" | RKHINST_DB_DIR="${VARDIR}/${APPNAME}/db" | ||||
| @@ -406,12 +406,12 @@ | @@ -406,12 +406,12 @@ selectTemplate() { # Take input from the "--install pa | ||||
| elif [ "${RKHINST_LAYOUT}" = "TXZ" ]; then | elif [ "${RKHINST_LAYOUT}" = "TXZ" ]; then | ||||
| RKHINST_DB_DIR="${VARDIR}/lib/${APPNAME}/db" | RKHINST_DB_DIR="${VARDIR}/lib/${APPNAME}/db" | ||||
| RKHINST_TMP_DIR="${VARDIR}/lib/${APPNAME}/tmp" | RKHINST_TMP_DIR="${VARDIR}/lib/${APPNAME}/tmp" | ||||
| - RKHINST_DOC_DIR="${PREFIX}/doc/${APPNAME}-${APPVERSION}" | - RKHINST_DOC_DIR="${PREFIX}/doc/${APPNAME}-${APPVERSION}" | ||||
| + RKHINST_DOC_DIR="${PREFIX}/doc/${APPNAME}" | + RKHINST_DOC_DIR="${PREFIX}/doc/${APPNAME}" | ||||
| RKHINST_MAN_DIR="${PREFIX}/man/man8" | RKHINST_MAN_DIR="${PREFIX}/man/man8" | ||||
| else | else | ||||
| RKHINST_DB_DIR="${VARDIR}/lib/${APPNAME}/db" | RKHINST_DB_DIR="${VARDIR}/lib/${APPNAME}/db" | ||||
| RKHINST_TMP_DIR="${VARDIR}/lib/${APPNAME}/tmp" | RKHINST_TMP_DIR="${VARDIR}/lib/${APPNAME}/tmp" | ||||
| - RKHINST_DOC_DIR="${SHAREDIR}/doc/${APPNAME}-${APPVERSION}" | - RKHINST_DOC_DIR="${SHAREDIR}/doc/${APPNAME}-${APPVERSION}" | ||||
| + RKHINST_DOC_DIR="${SHAREDIR}/doc/${APPNAME}" | + RKHINST_DOC_DIR="${SHAREDIR}/doc/${APPNAME}" | ||||
| fi | fi | ||||
| RKHINST_LANG_DIR="${RKHINST_DB_DIR}/i18n" | RKHINST_LANG_DIR="${RKHINST_DB_DIR}/i18n" | ||||
| @@ -1076,22 +1076,6 @@ | @@ -1099,22 +1099,6 @@ doRemove() { | ||||
| fi | fi | ||||
| fi | |||||
| done | done | ||||
| - | - | ||||
| - | |||||
| - # Application | - # Application | ||||
| - for FILE in ${RKHINST_BIN_FILES}; do | - for FILE in ${RKHINST_BIN_FILES}; do | ||||
| - if [ -f "${RKHINST_BIN_DIR}/${FILE}" ]; then | - if [ -f "${RKHINST_BIN_DIR}/${FILE}" ]; then | ||||
| - rm -f "${RKHINST_BIN_DIR}/${FILE}" >/dev/null 2>&1 | - rm -f "${RKHINST_BIN_DIR}/${FILE}" >/dev/null 2>&1 | ||||
| - ERRCODE=$? | - ERRCODE=$? | ||||
| - | - | ||||
| - if [ $ERRCODE -eq 0 ]; then | - if [ $ERRCODE -eq 0 ]; then | ||||
| - echo " Removing ${RKHINST_BIN_DIR}/${FILE}: OK" | - echo " Removing ${RKHINST_BIN_DIR}/${FILE}: OK" | ||||
| - else | - else | ||||
| - echo " Removing ${RKHINST_BIN_DIR}/${FILE}: FAILED: Code $ERRCODE" | - echo " Removing ${RKHINST_BIN_DIR}/${FILE}: FAILED: Code $ERRCODE" | ||||
| - fi | - fi | ||||
| - fi | - fi | ||||
| - done | - done | ||||
| - | - | ||||
| - | |||||
| # Configuration file | # Configuration file | ||||
| for FILE in ${RKHINST_ETC_FILE}; do | for FILE in ${RKHINST_ETC_FILE}; do | ||||
| if [ -f "${RKHINST_ETC_DIR}/${FILE}" ]; then | |||||