From 7dab30dbf7e9581d7cced8afeb9b05809f951e29 Mon Sep 17 00:00:00 2001 From: Philippe Houdoin Date: Tue, 12 Oct 2004 00:51:22 +0000 Subject: [PATCH] Move README.html upper. Add an install script to haiku-networkingkit-cvs package, featuring an uninstall.zip backup creation. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9287 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/network/Jamfile | 5 + src/kits/network/{libnet => }/README.html | 2 + src/kits/network/install.sh | 144 ++++++++++++++++++++++ src/kits/network/libnet/Jamfile | 3 - 4 files changed, 151 insertions(+), 3 deletions(-) rename src/kits/network/{libnet => }/README.html (97%) create mode 100755 src/kits/network/install.sh diff --git a/src/kits/network/Jamfile b/src/kits/network/Jamfile index 9c5c433845..2878c0d435 100644 --- a/src/kits/network/Jamfile +++ b/src/kits/network/Jamfile @@ -4,3 +4,8 @@ SubInclude OBOS_TOP src kits network libbind ; SubInclude OBOS_TOP src kits network libnet ; SubInclude OBOS_TOP src kits network libnetapi ; SubInclude OBOS_TOP src kits network libsocket ; + +Package haiku-networkingkit-cvs : + README.html install.sh ; + + diff --git a/src/kits/network/libnet/README.html b/src/kits/network/README.html similarity index 97% rename from src/kits/network/libnet/README.html rename to src/kits/network/README.html index 2563cdb2d8..7905318ad8 100644 --- a/src/kits/network/libnet/README.html +++ b/src/kits/network/README.html @@ -16,6 +16,8 @@ Currently, this package is intended to contain the Haiku Networking Kit and all Files:
boot/home/config/lib/libnet.so
boot/home/config/lib/libnetapi.so
+boot/home/config/lib/libsocket.so
+boot/home/config/lib/libbind.so
boot/home/config/add-ons/kernel/drivers/bin/net_stack_driver
boot/home/config/add-ons/kernel/drivers/bin/net_server_driver
boot/home/config/add-ons/kernel/drivers/bin/sis900
diff --git a/src/kits/network/install.sh b/src/kits/network/install.sh new file mode 100755 index 0000000000..0c144bda5d --- /dev/null +++ b/src/kits/network/install.sh @@ -0,0 +1,144 @@ +#!/bin/sh +base=`dirname "$0"` +cd "$base" + +function backup() +{ + BACKUP="uninstall.zip" + + rm -f "$BACKUP" + + # Backup BONE system files + zip -yqr "$BACKUP" "/boot/beos/system/add-ons/kernel/network" + zip -yq "$BACKUP" \ + "/boot/beos/system/lib/libnet.so" \ + "/boot/beos/system/lib/libnetdev.so" \ + "/boot/beos/system/lib/libnetapi.so" \ + "/boot/beos/system/lib/libsocket.so" \ + "/boot/beos/system/lib/libbind.so" \ + "/boot/beos/system/lib/libbnetapi.so" \ + "/boot/beos/system/lib/libnetconfig.so" \ + "/boot/beos/bin/ifconfig" \ + "/boot/beos/bin/ping" \ + "/boot/beos/bin/dhclient" \ + "/boot/beos/bin/dhconfig" \ + "/boot/beos/bin/dhcp_client" \ + "/boot/beos/bin/dhcpd" \ + "/boot/beos/bin/dhcrelay" \ + "/boot/beos/bin/dnskeygen" \ + "/boot/beos/bin/dnsquery" \ + "/boot/beos/bin/ftp" \ + "/boot/beos/bin/ftpd" \ + "/boot/beos/bin/host" \ + "/boot/beos/bin/inetd" \ + "/boot/beos/bin/ipalias" \ + "/boot/beos/bin/irpd" \ + "/boot/beos/bin/named" \ + "/boot/beos/bin/pppconfig" \ + "/boot/beos/bin/route" \ + "/boot/beos/bin/tcpdump" \ + "/boot/beos/bin/tcptrace" \ + "/boot/beos/bin/telnet" \ + "/boot/beos/bin/telnetd" \ + "/boot/beos/bin/traceroute" + + zip -yqr "$BACKUP" "/boot/beos/system/add-ons/boneyard" + zip -yq "$BACKUP" \ + "/boot/beos/preferences/Boneyard" \ + "/boot/home/config/be/Preferences/Boneyard" + + # Backup network drivers + for file in /boot/beos/system/add-ons/kernel/drivers/dev/net/* + do + f=`basename "$file"` + zip -yq "$BACKUP" "/boot/beos/system/add-ons/kernel/drivers/bin/$f" \ + "/boot/beos/system/add-ons/kernel/drivers/dev/net/$f" + done + for file in /boot/home/config/add-ons/kernel/drivers/dev/net/* + do + f=`basename "$file"` + zip -yq "$BACKUP" "/boot/home/config/add-ons/kernel/drivers/bin/$f" \ + "/boot/home/config/add-ons/kernel/drivers/dev/net/$f" + done + + zip -yqr "$BACKUP" \ + "/boot/beos/system/add-ons/kernel/obos_network" \ + "/boot/home/config/add-ons/kernel/obos_network" + zip -yq "$BACKUP" \ + "/boot/home/config/lib/libnet.so" \ + "/boot/home/config/lib/libnetapi.so" \ + "/boot/home/config/lib/libbind.so" \ + "/boot/home/config/lib/libsocket.so" \ + "/boot/home/config/lib/libbind.so" \ + "/boot/home/config/bin/arp" \ + "/boot/home/config/bin/ifconfig" \ + "/boot/home/config/bin/ping" \ + "/boot/home/config/bin/ppp_up" \ + "/boot/home/config/bin/pppconfig" \ + "/boot/home/config/bin/route" \ + "/boot/home/config/bin/traceroute" +} + + + +# Checking for BONE stack... +if [ -f /boot/beos/system/add-ons/kernel/network/bone_tcp -a \ + -c /dev/net/api ] +then + BONE=1 +fi + +# Checking for Haiku stack... +if [ \( -f /boot/beos/system/add-ons/kernel/obos_network/core -o \ + -f /boot/home/config/add-ons/kernel/obos_network/core \) -a \ + -c /dev/net/stack ] +then + HAIKU_NETKIT=1 +fi + +response=`alert "Do you want to backup files before installing Haiku networking kit. \ + This will create an uninstall.zip file to restore back your system." \ + "Backup & Install" "Install" "Abort - Don't do anything!"` + +if [ "$response" = "Backup & Install" ] +then + echo "Backup in progress..."; + backup; + response="Install" +elif [ "$response" = "Install" ] +then + response=`alert "No backup will be done. +That means it's up to YOU to ensure that you can restore your system in previous configuration. +We suggest STRONGLY to do it right now before it's too late..." \ + "Install" "Abort"` +fi + +if [ "$response" != "Install" ] +then + echo "Aborting..." + exit -1 +fi + +echo "Installing..." + +if [ -n "$TTY" ] +then + unzip -d / install.zip +else + response=`alert "Would you like to automatically overwrite existing files, or receive a prompt?" "Overwrite" "Prompt"` + if [ $response == "Overwrite" ] + then + unzip -od / install.zip + alert "Finished installing" "Thanks" + else + if [ -e /boot/beos/apps/Terminal ] + then + terminal=/boot/beos/apps/Terminal + else + terminal=`query Terminal | head -1` + fi + $terminal -t "installer" /bin/sh "$0" + fi +fi + + diff --git a/src/kits/network/libnet/Jamfile b/src/kits/network/libnet/Jamfile index 3a7227f099..fa8d6d24f9 100644 --- a/src/kits/network/libnet/Jamfile +++ b/src/kits/network/libnet/Jamfile @@ -75,9 +75,6 @@ OBOSInstallRelSymLink install-networking : libnet.so : installed-networking-test ; -Package haiku-networkingkit-cvs : - README.html ; - Package haiku-networkingkit-cvs : libnet.so : # boot home config lib ;