3c1d526d81
- Update to version v1.58
* Fixed bug in fields value persistency.
* Added CCFE_IWD environment variable (CCFE Invocation Working
Directory).
* Some cosmetics changes to several output.
* Some changes were made to ccfe(1), ccfe_menu(5) and
ccfe_form(5) manual pages.
version 1.57
* Fixed bug in init{} block: bad values initialization if they
contains '=' character.
* Added the ability to call forms from menus using arguments,
(until this version, it was possible only calling forms from
forms).
* Changed default ccfe.conf: removed terminal-dependent settings
and moved old ccfe.conf as ccfe.conf.console in samples
directory.
* Some changes were made to ccfe(1) and ccfe.conf(5) manual
pages.
version 1.56
* Added <Shift>+<Tab> key functionality, and extended the
ability to browse forward and backward the list of accepted
values (with <Tab> and <Shift>+<Tab>) to any field where
attribute list_cmd has source-type=const and
list-type=single-val.
* Added the metacharacter "*" to refer to all fields IDs in form
actions: now is possible to refer to them with "%{*}" instead
"%{id_0}%{id_1}...%{id_N}".
* Some changes were made to ccfe(1), ccfe.conf(5) and
ccfe_form(5) manual pages.
- Refreshed ccfe-destdir.patch
- Spec cleanup
OBS-URL: https://build.opensuse.org/request/show/573693
OBS-URL: https://build.opensuse.org/package/show/utilities/ccfe?expand=0&rev=7
136 lines
4.7 KiB
Diff
136 lines
4.7 KiB
Diff
Index: install.sh
|
|
===================================================================
|
|
--- install.sh.orig
|
|
+++ install.sh
|
|
@@ -22,6 +22,7 @@
|
|
|
|
# getopt() used for shell portability
|
|
|
|
+[ -n "$DESTDIR" ] || DESTDIR=""
|
|
PREFIX='/usr/local/ccfe';
|
|
ETCDIR="$PREFIX/etc"
|
|
BINDIR="$PREFIX/bin"
|
|
@@ -84,7 +85,7 @@ mk_manpage ()
|
|
local s # Manual section
|
|
|
|
s=`echo $p | cut -c ${#p}`
|
|
- cat man/$p | sed -e "s/ETC_DIR_PLACEHOLDER/$exp_etcdir/ ; s/BIN_DIR_PLACEHOLDER/$exp_bindir/ ; s/LIB_DIR_PLACEHOLDER/$exp_libdir/ ; s/LOG_DIR_PLACEHOLDER/$exp_logdir/ ; s/MSG_DIR_PLACEHOLDER/$exp_msgdir/ ; s/DOC_DIR_PLACEHOLDER/$exp_docdir/" > $MANDIR/man${s}/$p
|
|
+ cat man/$p | sed -e "s/ETC_DIR_PLACEHOLDER/$exp_etcdir/ ; s/BIN_DIR_PLACEHOLDER/$exp_bindir/ ; s/LIB_DIR_PLACEHOLDER/$exp_libdir/ ; s/LOG_DIR_PLACEHOLDER/$exp_logdir/ ; s/MSG_DIR_PLACEHOLDER/$exp_msgdir/ ; s/DOC_DIR_PLACEHOLDER/$exp_docdir/" > $DESTDIR$MANDIR/man${s}/$p
|
|
}
|
|
|
|
|
|
@@ -125,36 +126,36 @@ install ()
|
|
umask 0022
|
|
if [ $update -eq 0 ]; then
|
|
echo "Creating directories..."
|
|
- mkdir -p $ETCDIR
|
|
- mkdir -p $BINDIR
|
|
- mkdir -p $LIBDIR
|
|
- mkdir -p $LOGDIR
|
|
- mkdir -p $MSGDIR/C
|
|
- mkdir -p $MANDIR/man1
|
|
- mkdir -p $MANDIR/man5
|
|
- mkdir -p $DOCDIR
|
|
- mkdir -p $DOCDIR/samples
|
|
- chmod 1777 $LOGDIR
|
|
+ mkdir -p $DESTDIR$ETCDIR
|
|
+ mkdir -p $DESTDIR$BINDIR
|
|
+ mkdir -p $DESTDIR$LIBDIR
|
|
+ mkdir -p $DESTDIR$LOGDIR
|
|
+ mkdir -p $DESTDIR$MSGDIR/C
|
|
+ mkdir -p $DESTDIR$MANDIR/man1
|
|
+ mkdir -p $DESTDIR$MANDIR/man5
|
|
+ mkdir -p $DESTDIR$DOCDIR
|
|
+ mkdir -p $DESTDIR$DOCDIR/samples
|
|
+ chmod 1777 $DESTDIR$LOGDIR
|
|
fi
|
|
|
|
echo "Copying program files..."
|
|
- sed -e "/^\$PREFIX = /d ; s/^\$ETCDIR = .*$/\$ETCDIR = '$exp_etcdir';/ ; s/^\$BINDIR = .*$/\$BINDIR = '$exp_bindir';/ ;s/^\$LIBDIR = .*$/\$LIBDIR = '$exp_libdir';/ ;s/^\$LOGDIR = .*$/\$LOGDIR = '$exp_logdir';/ ;s/^\$MSGDIR = .*$/\$MSGDIR = '$exp_msgdir';/ ;" ccfe.pl > $BINDIR/ccfe
|
|
- chmod 755 $BINDIR/ccfe
|
|
+ sed -e "/^\$PREFIX = /d ; s/^\$ETCDIR = .*$/\$ETCDIR = '$exp_etcdir';/ ; s/^\$BINDIR = .*$/\$BINDIR = '$exp_bindir';/ ;s/^\$LIBDIR = .*$/\$LIBDIR = '$exp_libdir';/ ;s/^\$LOGDIR = .*$/\$LOGDIR = '$exp_logdir';/ ;s/^\$MSGDIR = .*$/\$MSGDIR = '$exp_msgdir';/ ;" ccfe.pl > $DESTDIR$BINDIR/ccfe
|
|
+ chmod 755 $DESTDIR$BINDIR/ccfe
|
|
|
|
if [ $update -eq 0 ]; then
|
|
- cp ccfe.conf $ETCDIR/
|
|
- cp msg/C/ccfe $MSGDIR/C/ccfe
|
|
+ cp ccfe.conf $DESTDIR$ETCDIR/
|
|
+ cp msg/C/ccfe $DESTDIR$MSGDIR/C/ccfe
|
|
|
|
# Test main menu:
|
|
- mkdir -p $LIBDIR/ccfe
|
|
- cp ccfe.menu $LIBDIR/ccfe
|
|
- echo "Creating sample file $LIBDIR/ccfe/it_works.txt..."
|
|
- mk_welcome > $LIBDIR/ccfe/it_works.txt
|
|
+ mkdir -p $DESTDIR$LIBDIR/ccfe
|
|
+ cp ccfe.menu $DESTDIR$LIBDIR/ccfe
|
|
+ echo "Creating sample file $DESTDIR$LIBDIR/ccfe/it_works.txt..."
|
|
+ mk_welcome > $DESTDIR$LIBDIR/ccfe/it_works.txt
|
|
|
|
# Demos:
|
|
- cp -r demo.menu $LIBDIR/ccfe
|
|
- cp -r demo.d $LIBDIR/ccfe
|
|
- PATH=$BINDIR:$PATH
|
|
+ cp -r demo.menu $DESTDIR$LIBDIR/ccfe
|
|
+ cp -r demo.d $DESTDIR$LIBDIR/ccfe
|
|
+ PATH=$DESTDIR$BINDIR:$PATH
|
|
export PATH
|
|
cd ccfe-plugin-sysmon
|
|
./install.sh
|
|
@@ -168,14 +169,14 @@ install ()
|
|
done
|
|
|
|
echo "Copying release documentation and samples..."
|
|
- cp README COPYING AUTHORS ChangeLog $DOCDIR/
|
|
- cp -rp ccfe-plugin-sysmon $DOCDIR/samples
|
|
- cp -p ccfe.conf.console $DOCDIR/samples
|
|
+ cp README COPYING AUTHORS ChangeLog $DESTDIR$DOCDIR/
|
|
+ cp -rp ccfe-plugin-sysmon $DESTDIR$DOCDIR/samples
|
|
+ cp -p ccfe.conf.console $DESTDIR$DOCDIR/samples
|
|
|
|
if [ $update -eq 0 ]; then
|
|
# Save subdirs for future uninstall option:
|
|
echo "Saving install informations..."
|
|
- cat <<EOT > "$ETCDIR/$SAVED_INFO"
|
|
+ cat <<EOT > "$DESTDIR$ETCDIR/$SAVED_INFO"
|
|
# Installed on $(date)
|
|
ETCDIR="$ETCDIR"
|
|
BINDIR="$BINDIR"
|
|
Index: ccfe-plugin-sysmon/install.sh
|
|
===================================================================
|
|
--- ccfe-plugin-sysmon/install.sh.orig
|
|
+++ ccfe-plugin-sysmon/install.sh
|
|
@@ -24,6 +24,7 @@
|
|
# plugins.
|
|
|
|
INSTANCE=ccfe
|
|
+[ -n "$DESTDIR" ] || DESTDIR=""
|
|
|
|
ABORT_MSG='Plugin installation aborted'
|
|
MYNAME='sysmon plugin'
|
|
@@ -35,17 +36,17 @@ $INSTANCE -h > /dev/null 2>&1 || { echo
|
|
eval $($INSTANCE -c 2>&1 | grep LIB_DIR)
|
|
prefix=$LIB_DIR/$INSTANCE
|
|
|
|
-if [ -d $prefix/demo.menu ]
|
|
+if [ -d $DESTDIR$prefix/demo.menu ]
|
|
then
|
|
- if [ -w $prefix ]
|
|
+ if [ -w $DESTDIR$prefix ]
|
|
then
|
|
- cp sysmon.item $prefix/demo.menu/
|
|
- cp sysmon.menu $prefix/
|
|
- cp -r sysmon.d $prefix/
|
|
- cp README $prefix/sysmon.d/
|
|
+ cp sysmon.item $DESTDIR$prefix/demo.menu/
|
|
+ cp sysmon.menu $DESTDIR$prefix/
|
|
+ cp -r sysmon.d $DESTDIR$prefix/
|
|
+ cp README $DESTDIR$prefix/sysmon.d/
|
|
echo "$MYNAME installed in default demo menu."
|
|
else
|
|
- echo "cannot write $prefix - $ABORT_MSG"
|
|
+ echo "cannot write $DESTDIR$prefix - $ABORT_MSG"
|
|
exit 2
|
|
fi
|
|
else
|