2005-09-21 07:38:51 -04:00
|
|
|
$OpenBSD: patch-install_sh,v 1.13 2005/09/21 11:38:51 sturm Exp $
|
|
|
|
--- install.sh.orig Fri Sep 16 12:16:47 2005
|
|
|
|
+++ install.sh Tue Sep 20 11:14:10 2005
|
2005-05-28 12:32:18 -04:00
|
|
|
@@ -1132,7 +1132,7 @@ run_install()
|
2005-02-05 08:14:35 -05:00
|
|
|
mkdir $mkdirv $mkdirp $share_dir/help/
|
|
|
|
chmod $chmodv 755 $share_dir/help
|
|
|
|
cp $cpv $cpf $cpR help/* $share_dir/help/
|
|
|
|
- if not test -d "$doc_dir/help"; then ln -s $str_localdirshare/help $doc_dir/help; fi
|
|
|
|
+ ln -s $str_localdirshare/help $doc_dir/help
|
|
|
|
fi
|
|
|
|
|
|
|
|
mkdir $mkdirv $mkdirp $share_dir/config/
|
2005-05-28 12:32:18 -04:00
|
|
|
@@ -1182,9 +1182,7 @@ run_install()
|
2004-05-12 15:35:45 -04:00
|
|
|
chmod $chmodv 755 $share_dir/styles/user
|
|
|
|
cp $cpv $cpf $cpR styles/user/* $share_dir/styles/user/
|
|
|
|
|
|
|
|
- if not test -f "$share_dir/styles/OPF.css"; then
|
|
|
|
- ln $lns opf.css $share_dir/styles/OPF.css
|
|
|
|
- fi
|
|
|
|
+ ln $lns opf.css $share_dir/styles/OPF.css
|
|
|
|
|
2005-06-18 16:46:32 -04:00
|
|
|
cp $cpv $cpf chartables.bin $share_dir/
|
2004-05-12 15:35:45 -04:00
|
|
|
|
2005-05-28 12:32:18 -04:00
|
|
|
@@ -1295,7 +1293,7 @@ run_install()
|
2001-05-16 10:44:26 -04:00
|
|
|
|
2003-11-09 04:46:26 -05:00
|
|
|
# System wide configuration files
|
2003-04-27 12:27:50 -04:00
|
|
|
config_dir="/etc"
|
|
|
|
- if can_write_to "$config_dir"; then
|
|
|
|
+ if false can_write_to "$config_dir"; then
|
2002-07-03 16:37:36 -04:00
|
|
|
echo
|
|
|
|
echo "System wide configuration files:"
|
2003-04-27 12:27:50 -04:00
|
|
|
echo " $config_dir/opera6rc"
|
2005-09-21 07:38:51 -04:00
|
|
|
@@ -1322,9 +1320,7 @@ run_install()
|
|
|
|
if test "$flag_mode" = "--force" -o "$flag_mode" = "--prefix="; then
|
|
|
|
echo
|
|
|
|
echo "Shortcut icons cannot be installed with the prefix \"$prefix\"."
|
|
|
|
- if not con_firm "Do you still want to install them"; then
|
|
|
|
- bool_icons=0
|
|
|
|
- fi
|
|
|
|
+ bool_icons=0
|
2002-07-03 16:37:36 -04:00
|
|
|
fi
|
|
|
|
|
2005-09-21 07:38:51 -04:00
|
|
|
if test "${bool_icons}" -ne 0; then
|