[patch] patch needed for the verlihub cvs ebuild

verlihub-20060814-vh_install.patch (text/plain), 3.62 KB, created by luc vlaming on 2006-11-03 08:12:59 UTC

--- verlihub/scripts/vh_install.in	2005-05-19 00:46:48.000000000 +0200
+++ ./vh_install.in	2006-11-03 16:00:34.000000000 +0100
@@ -14,13 +14,9 @@
 
 if [ ! $PWD ]; then PWD=`pwd`; fi
 
-if [ $USER == "root" ]; then
-	default_cfgdir="/etc/verlihub"
-	port_default=411
-else
-	default_cfgdir="$HOME/.verlihub"
-	port_default=4111
-fi
+default_cfgdir="/etc/verlihub"
+cfg_dir=$default_cfgdir
+port_default=411
 
 function die
 {
@@ -96,7 +92,7 @@
 
 
 Sep
-realname=`GetVar "" "$USER" "Your name ?" "Hi, %val%!!"`
+realname=`GetVar "" "$USER" "Give your name please ?" "Hi, %val%!!"`
 
 echo
 echo "Hello $realname, "
@@ -159,70 +155,22 @@
 	Sep
 fi;
 
-
-echo
-Sep
-echo
-echo "$realname, you need to choos a place for the configuration files"
-Sep
-echo "The order of folder that verlihub is looking for is following:"
-echo 
-echo -n "1 - variable \$VERLIHUB_CFG          - "; PrintCfgFolderStatus "$VERLIHUB_CFG"; echo
-echo -n "2 - ./.verlihub                      - "; PrintCfgFolderStatus "$PWD/.verlihub"; echo
-echo -n "3 - $HOME/.verlihub        - "; PrintCfgFolderStatus "$HOME/.verlihub"; echo
-echo -n "4 - $prefix/etc/verlihub   - "; PrintCfgFolderStatus "$prefix/etc/verlihub"; echo
-echo -n "5 - /etc/verlihub                    - "; PrintCfgFolderStatus "/etc/verlihub"; echo
-echo "if two or more of these exist, lower number has priority"
 Sep
-echo
-
-
-cfg_info_ok=false
-
-until $cfg_info_ok;
-do
-	Sep
-	cfg_dir=`GetVar "$bindir/vh_getcfg" "$default_cfgdir" "what is will be the configuration folder ?"`
-
-	[ -d $cfg_dir ] && cfg_exists=true || cfg_exists=false
-	$cfg_exists && echo "This config folder already exists and may be overwitten (with a backup)" || echo "The config folder $cfg_dir does not exist and would be created"
-	Sep
-
-	YesNo "Do you want to continue with these settings (if not then select another folder) ?" && cfg_info_ok=true || echo "Let's do it again"
-done
-
-
-
-cfg_create=true
-if $cfg_exists; then
-	YesNo "Do you want to overwrite the existing configuration ?" || cfg_create=false
-fi
-
-if $cfg_create ; then
-	Sep
-	mkdir -p $cfg_dir
-	cfg_dbconfig="$cfg_dir/dbconfig"
-
-	# backup eventually the original config
-	if [ -e $cfg_dbconfig ]; then
-		tmpdir=/tmp/vh_install_$$_$timestamp
-		mkdir $tmpdir
-		mv $cfg_dir/* $tmpdir
-		mv $tmpdir $cfg_dir/_backup
-		echo "FYI: original configuration has been moved to $cfg_dir/_backup"
-	fi
+mkdir -p $cfg_dir
+cfg_dbconfig="$cfg_dir/dbconfig"
 
-	echo "db_host = $mysql_host" >  $cfg_dbconfig
-	echo "db_data = $mysql_data" >> $cfg_dbconfig
-	echo "db_user = $mysql_user" >> $cfg_dbconfig
-	echo "db_pass = $mysql_pass" >> $cfg_dbconfig
-
-	echo "Written: $cfg_dbconfig"
-
-	cp -R @datadir@/config/* $cfg_dir
-	mkdir -p $cfg_dir/plugins
-	mkdir -p $cfg_dir/scripts
-	ln -s @libdir@/libplug_pi.so $cfg_dir/plugins
+echo "db_host = $mysql_host" >  $cfg_dbconfig
+echo "db_data = $mysql_data" >> $cfg_dbconfig
+echo "db_user = $mysql_user" >> $cfg_dbconfig
+echo "db_pass = $mysql_pass" >> $cfg_dbconfig
+
+echo "Written: $cfg_dbconfig"
+
+mkdir -p $cfg_dir/plugins
+mkdir -p $cfg_dir/scripts
+[ -f $cfg_dir/plugins/libplug_pi.so ] && libplug_exists=true || libplug_exists=false
+if ! $libplug_exists ; then
+    ln -s @libdir@/libplug_pi.so $cfg_dir/plugins
 fi
 
 echo
@@ -253,7 +201,8 @@
 
 until $setup_info_ok; do
 	Sep
-	echo "Try to not put many special characters, you'll be able to put some laer"
+	echo "Try to not put many special characters, you'll be able to put some later."
+	echo "If you made a typo, you can correct this later (you'll be asked if the info you filled in is correct."
 	echo
 	hostname=`hostname`
 	vh_master=`GetVar "" "[SU]$USER" "Give me your DC hub master nickname.."`