1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
$NetBSD: patch-ad,v 1.10 2012/05/04 16:01:53 joerg Exp $
--- install.sh.orig 2001-08-08 00:14:54.000000000 +0000
+++ install.sh
@@ -57,7 +57,7 @@ XBINOWNER=root
XBINGROUP=bin
ERRFILE=/tmp/xmcd.err
TMPFILE=/tmp/xmcdinst.$$
-STARTUP_SCRIPT=.xmcd_start
+STARTUP_SCRIPT=xmcd_start
#
# Utility functions
@@ -493,7 +493,7 @@ trap "rm -f $TMPFILE; exit 1" 1 2 3 5 15
#
OS_SYS=`(uname -s) 2>/dev/null`
OS_REL=`(uname -r) 2>/dev/null`
-OS_MACH=`(uname -m) 2>/dev/null`
+OS_MACH=@MACHINE_ARCH@
if [ -z "$OS_SYS" ]
then
@@ -693,7 +693,7 @@ then
$ECHO "\n\nYou should be the super user to install xmcd."
YNDEF=n
- if [ -z "$BATCH" ] && get_yn "\n Proceed with installation anyway"
+ if true
then
$ECHO "\nWARNING: Without super-user privilege, some files may"
$ECHO "not be properly installed, or they may be installed"
@@ -1159,10 +1159,10 @@ fi
# Install files
SHELL_S=`echo $SHELL | sed 's/\//\\\\\//g'`
-BINDIR_S=`echo $BINDIR | sed 's/\//\\\\\//g'`
-LIBDIR_S=`echo $LIBDIR | sed 's/\//\\\\\//g'`
-XMCDLIB_S=`echo $XMCDLIB | sed 's/\//\\\\\//g'`
-DISCOGDIR_S=`echo $DISCOGDIR | sed 's/\//\\\\\//g'`
+BINDIR_S=`echo $REAL_BINDIR | sed 's/\//\\\\\//g'`
+LIBDIR_S=`echo $REAL_LIBDIR | sed 's/\//\\\\\//g'`
+XMCDLIB_S=`echo $REAL_XMCDLIB | sed 's/\//\\\\\//g'`
+DISCOGDIR_S=`echo $REAL_DISCOGDIR | sed 's/\//\\\\\//g'`
XMCDURL_S=`echo $XMCD_URL | sed 's/\//\\\\\//g'`
$ECHO "\nInstalling xmcd files..."
@@ -1226,20 +1226,11 @@ do
done
# Configuration files
-if [ -f $XMCDLIB/config/common.cfg ]
-then
- diff $XMCDLIB/config/common.cfg libdi_d/common.cfg >/dev/null 2>&1
- if [ $? -ne 0 ]
- then
- # Save old config file for use by config.sh
- mv $XMCDLIB/config/common.cfg $XMCDLIB/config/common.cfg.old
- fi
-fi
-inst_file libdi_d/common.cfg $XMCDLIB/config/common.cfg \
+inst_file libdi_d/common.cfg $XMCDLIB/config/common.cfg.dist \
$FILEPERM $OWNER $GROUP
-inst_file libdi_d/device.cfg $XMCDLIB/config/device.cfg \
+inst_file libdi_d/device.cfg $XMCDLIB/config/device.cfg.dist \
$FILEPERM $OWNER $GROUP
-inst_file cdinfo_d/wwwwarp.cfg $XMCDLIB/config/wwwwarp.cfg \
+inst_file cdinfo_d/wwwwarp.cfg $XMCDLIB/config/wwwwarp.cfg.dist \
$FILEPERM $OWNER $GROUP
rm -f $XMCDLIB/config/.tbl/*
@@ -1595,12 +1586,6 @@ then
done
fi
-# Generate local discography index files
-if [ -x $XMCDLIB/scripts/genidx ]
-then
- $XMCDLIB/scripts/genidx
-fi
-
if [ -z "$BATCH" ]
then
# Run device-dependent config script
|
