yacy: 0.55_20071004_4145 -> 0.56

* cleaned up the version and now using the pro version
  since the old version dosn't appear on the site anymore
* moved from /usr/share/yacy to /usr/lib/yacy, as a result
  if you have a existing install please move
  /usr/share/yacy/DATA to /usr/lib/yacy/DATA
* removed alot of junk files and source code
* cleaned up pre-install and README

yacy/.md5sum

@@ -1,4 +1,4 @@
-11d59eb69b38c20befa72632a85ed2f0  yacy-start.sh
+b7e84a2c57a0dca656ea650088abdcd1  yacy-start.sh
-aa1042106daa0c8e5e083b7db532a2b7  yacy-stop.sh
+3d51b10d074af11080dab542b94fbb0c  yacy-stop.sh
 d77dc8b70b0e1434650079f5ee61e3fc  yacy.rc
-a3bb8bbf090012b9b7ceba98294356fb  yacy_v0.55_20071004_4145.tar.gz
+d4401fb5c1a8eb0bdbf08510cbcc15a0  yacy_pro_v0.56_20071222_4290.tar.gz

yacy/Pkgfile

@@ -5,9 +5,10 @@
 # Depends on: ant
 
 name=yacy
-version=0.55_20071004_4145
+version=0.56
+date=20071222_4290
 release=1
-source=(http://www.yacy.net/release/yacy_v$version.tar.gz \
+source=(http://www.yacy.net/release/yacy_pro_v${version}_$date.tar.gz \
 	yacy-start.sh yacy-stop.sh yacy.rc)
 
 build() {
@@ -20,30 +21,32 @@ build() {
 	ant
 
 	# remove un-needed files
-	find $SRC/yacy -type f \
+	find $SRC/yacy -type f \( \
-		-name '*.bat' -delete -or \
+		-name '*.bat' -o \
-		-name '*.txt' -delete -or \
+		-name '*.txt' -o \
-		-name '*.css.old' -delete -or \
+		-name '*.css.old' -o \
-		-name '*.readme' -delete
+		-name '*.readme' -o \
+		-name '*.License' -o \
+		-name '*.java'	\) -delete
 
 	rm -r \
 		source \
-		htroot/locale \
+		locales \
-		locales
+		RELEASE
-		#classes/de
-		#RELEASE/EXT/{source,classes}/de
 	
 	rm \
 		build.xml \
-		htroot/CacheAdmin_p.java.ThomasBockig \
+		build.properties \
-		htroot/.nbattrs
+		lib/tar.license \
+		addon/jsmooth/skeletons/console-wrapper/consolewrapper.exe \
+		addon/jsmooth/skeletons/windowed-wrapper/jwrap.exe
 
 	# install
-	install -d $PKG/usr/share/yacy
+	install -d $PKG/usr/lib/yacy
-	cp -R * $PKG/usr/share/yacy/
+	cp -R * $PKG/usr/lib/yacy/
 
 	# add some protection by limitng what and who can access the p2p files.
-	chown -R _yacy:daemon $PKG/usr/share/yacy
+	chown -R _yacy:daemon $PKG/usr/lib/yacy
 	
 	install -D -m 0755 $SRC/yacy-start.sh $PKG/usr/sbin/yacy-start
 	install -D -m 0755 $SRC/yacy-stop.sh $PKG/usr/sbin/yacy-stop

yacy/README

@@ -2,18 +2,20 @@ REQUIREMENTS:
 
 PRECAUTION:
 
-	Once running goto the main page http://localhost:8080/ and set a password and
+	Once running goto the main page http://localhost:8080/ and 
-	maybe change the port too.
+	set a password and maybe change the port too.
 
 PRE-INSTALL:
 
-	Yacy expects to have a user and group dedicated to it, a pre-install 
+	Yacy expects to have a user and group dedicated to it, a 
-	script has been added to the port which takes care of this.
+	pre-install script has been added to the port which takes 
+	care of this.
 
 POST-INSTALL:
 
-	Edit your favourite web browser and point it to proxy localhost 8080 or which 
+	Edit your favourite web browser and point it to proxy 
-	ip on your lan and port you have assigned.
+	localhost 8080 or which ip on your lan and port you have 
+	assigned.
 
 PRE-REMOVE:
 
@@ -21,9 +23,10 @@ POST-REMOVE:
 
 NOTES:
 
-	Please add "yacy" to the SERVICES array in /etc/rc.conf if you'd like to run 
+	Please add "yacy" to the SERVICES array in /etc/rc.conf if 
-	yacy as a service (highly recomended).
+	you'd like to run yacy as a service (highly recomended).
 
-	Apon startup yacy takes some time to load before the web browser will work, 
+	Upon startup yacy takes some time to load before the web 
-	and some time to shutdown too to save its state.
+	browser will load the initial page, and some time to 
+	shutdown too to save its state.
 

yacy/pre-install

@@ -8,29 +8,35 @@ USER_COMMENT="Yacy Daemon"
 USER_HOME=/var/empty
 USER_SHELL=/bin/sh
 
-if [ $GROUP ]
+if [ ! $(id -u) = 0 ]; then
-	then
+	echo "ERROR: you need to be root to run this!"
-		if ! grep -qi $GROUP /etc/group
+	exit 1
-			then
+fi
-				/usr/sbin/groupadd $GROUP
+
-				if [ $? -eq 0 ]
+if [ $GROUP ];	then
-					then
+	if ! getent group $GROUP > /dev/null; then
-						echo "Group: $GROUP added."
+		/usr/sbin/groupadd $GROUP
-				fi
+		if [ $? -eq 0 ]; then
-			else
+			echo "Group: $GROUP added."
-				echo "Group: $GROUP already exists! Skipping."
+		fi
-		fi
+	else
-fi
+		echo "Group: $GROUP already exists! Skipping."
-	
+	fi
-if ! grep -qi $USER /etc/shadow
+fi
-	then
+	
-		/usr/sbin/useradd -g $GROUP -c "$USER_COMMENT" -d $USER_HOME -s $USER_SHELL $USER
+if ! getent passwd $USER > /dev/null; then
-		if [ $? -eq 0 ]
+	/usr/sbin/useradd -g $GROUP -c "$USER_COMMENT" -d $USER_HOME -s $USER_SHELL $USER
-			then
+	if [ $? -eq 0 ]; then
-				/usr/bin/passwd -l $USER
+		echo "User: $USER added."
-				echo "User: $USER added."
+		/usr/bin/passwd -l $USER
-		fi
+		if [ $? -eq 0 ]; then
-		else
+			echo "Locked $USER account."
-			echo "User: $USER already exists! Skipping."
+		fi
+		else
+			echo "ERROR: unable to lock $USER account."
+			/usr/sbin/userdel $USER
+	fi
+	else
+		echo "User: $USER already exists! Skipping."
 fi
 

yacy/yacy-start.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-cd /usr/share/yacy
+cd /usr/lib/yacy
 ./startYACY.sh
 

yacy/yacy-stop.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-cd /usr/share/yacy
+cd /usr/lib/yacy
 ./stopYACY.sh