[vhffs-dev] [svn] commit: r57 - in trunk: Makefile make_release make_release2 vhffs-listengine/src/archives/css/ vhffs-shells/tuxshell

[vhffs-dev@xxxxxxxxx]

Author: soda
Date: Sun Jul 17 23:58:36 2005
New Revision: 57

Log:
Clean scripts(install, packaging, ...)


Added:
    trunk/vhffs-listengine/src/archives/css/
Modified:
    trunk/Makefile
    trunk/make_release
    trunk/make_release2
    trunk/vhffs-shells/tuxshell

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sun Jul 17 23:58:36 2005
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/make
 
 # This is a part of VHFFS platform
 # This is VHFFS installer
@@ -7,7 +7,6 @@
 # Informations : http://www.vhffs.org
 
 CURRENTDIR=`pwd`
-
 APIDIR="/usr/share/perl5/Vhffs/"
 PANELDIR="${DESDTIR}/usr/share/vhffs/panel/"
 TEMPLATESDIR="${DESDTIR}/usr/share/vhffs/templates/"
@@ -20,16 +19,20 @@
 TOOLSDIR="${DESDTIR}/usr/bin/"
 LEARCHIVES="${DESDTIR}/usr/share/vhffs/listengine/archives"
 
+
 echo -n "Will install VHFFS in /"
 echo ${DESTDIR}
 
 
 echo -n "Install main VHFFS API ... "
+	rm -rf "${DESTDIR}/${APIDIR}" 1>/dev/null 2>&1
 	mkdir -p "${DESTDIR}/${APIDIR}"
 	if [ ! -d "${CURRENTDIR}/vhffs-api" ]; then
 		echo "vhffs-api module not found in sources"
 	else
 		cp -r vhffs-api/src/Vhffs/* "${DESTDIR}/${APIDIR}/"
+		find "${DESTDIR}/${APIDIR}/" -type f | xargs chmod 644
+		find "${DESTDIR}/${TEMPLATESDIR}/" -type f | xargs chown root:root
 	fi
 echo "done"
 
@@ -37,48 +40,62 @@
 
 
 echo -n "Install main VHFFS Panel ... "
+	rm -rf "${DESTDIR}/${PANELDIR}" 1>/dev/null 2>&1
 	mkdir -p "${DESTDIR}/${PANELDIR}"
 	if [ ! -d "${CURRENTDIR}/vhffs-panel" ]; then
 		echo "vhffs-panel module not found in sources"
 	else
+
 		cp -r vhffs-panel/* "${DESTDIR}/${PANELDIR}/"
 		rm -fr "${DESTDIR}/${PANELDIR}/templates"
+		find "${DESTDIR}/${TEMPLATESDIR}/" -type f | xargs chmod 755
+		find "${DESTDIR}/${TEMPLATESDIR}/" -type f | xargs chown root:root
 	fi
 echo "done"
 
 
 
 echo -n "Install main VHFFS Templates ... "
+	rm -rf "${DESTDIR}/${TEMPLATESDIR}" 1>/dev/null 2>&1
 	mkdir -p "${DESTDIR}/${TEMPLATESDIR}"
 	if [ ! -d "${CURRENTDIR}/vhffs-panel/templates" ]; then
 		echo "vhffs-templates module not found in sources"
 	else
 		cp -r vhffs-panel/templates/* "${DESTDIR}/${TEMPLATESDIR}/"
+		find "${DESTDIR}/${TEMPLATESDIR}/" -type f | xargs chmod 644
+		find "${DESTDIR}/${TEMPLATESDIR}/" -type f | xargs chown root:root
 	fi
 echo "done"
 
 echo -n "Install VHFFS backend files ... "
+	rm -rf "${DESTDIR}/${BACKENDDIR}" 1>/dev/null 2>&1
 	mkdir -p "${DESTDIR}/${BACKENDDIR}"
 	if [ ! -d "${CURRENTDIR}/vhffs-backend/src/pgsql" ]; then
 		echo "vhffs-backend module not found in sources"
 	else
 		cp -r vhffs-backend/src/pgsql/* "${DESTDIR}/${BACKENDDIR}/"
+		find "${DESTDIR}/${BACKENDDIR}/" -type f | xargs chmod 644
+		find "${DESTDIR}/${BACKENDDIR}/" -type f | xargs chown root:root
 	fi
 echo "done"
 
 
 
 echo -n "Install VHFFS doc ... "
+	rm -rf "${DESTDIR}/${DOCDIR}" 1>/dev/null 2>&1
 	mkdir -p "${DESTDIR}/${DOCDIR}"
 	if [ ! -d "${CURRENTDIR}/vhffs-doc" ]; then
 		echo "vhffs-doc module not found in sources"
 	else
 		cp -r vhffs-doc/* "${DESTDIR}/${DOCDIR}/"
+		find "${DESTDIR}/${DOCDIR}/" -type f | xargs chmod 644
+		find "${DESTDIR}/${DOCDIR}/" -type f | xargs chown root:root
 	fi
 echo "done"
 
 
 echo -n "Install VHFFS bots ... "
+	rm -rf "${DESTDIR}/${BOTSDIR}" 1>/dev/null 2>&1
 	mkdir -p "${DESTDIR}/${BOTSDIR}"
 	if [ ! -d "${CURRENTDIR}/vhffs-robots/src/" ]; then
 		echo "vhffs-robots module not found in sources"
@@ -94,11 +111,14 @@
 
 
 echo -n "Install VHFFS intl ... "
+	rm -rf "${DESTDIR}/${INTLDIR}" 1>/dev/null 2>&1
 	mkdir -p "${DESTDIR}/${INTLDIR}"
 	if [ ! -d "${CURRENTDIR}/vhffs-intl/" ]; then
 		echo "vhffs-intl module not found in sources"
 	else
 		cp -r vhffs-intl/result/* "${DESTDIR}/${INTLDIR}/"
+		find "${DESTDIR}/${INTLDIR}/" -type f | xargs chmod 644
+		find "${DESTDIR}/${INTLDIR}/" -type f | xargs chown root:root
 		echo "done"
 	fi
 
@@ -139,7 +159,8 @@
 		if [ -f "${DESTDIR}/${CONFDIR}/vhffs.conf" ]; then
 			echo "VHFFS config file already exists"
 		else
-			cp -r vhffs-backend/conf/vhffs.conf "${DESTDIR}/${CONFDIR}/"
+			cp -f vhffs-backend/conf/vhffs.conf "${DESTDIR}/${CONFDIR}/"
+			chmod 755 "${DESTDIR}/${CONFDIR}/vhffs.conf"
 			echo "done"
 		fi
 	fi

Modified: trunk/make_release
==============================================================================
--- trunk/make_release (original)
+++ trunk/make_release Sun Jul 17 23:58:36 2005
@@ -60,7 +60,7 @@
 
 sub tar_distro
 {
-	my $output_file = "VHFFS".$version.".tgz";
+	my $output_file = "vhffs".$version.".tgz";
 	my $files;
 	foreach( @files_to_package )
 	{

Modified: trunk/make_release2
==============================================================================
--- trunk/make_release2 (original)
+++ trunk/make_release2 Sun Jul 17 23:58:36 2005
@@ -6,7 +6,7 @@
 use strict;
 use File::Copy;
 
-my $VERSION = "4.0-RC6";
+my $VERSION = "4.0rc6";
 my @files_to_delete = qw(backup.sh fixperm.sh make_release make_release2);
 my @files_to_package = qw( TODO Makefile Changelog AUTHORS vhffs-api vhffs-backend vhffs-doc vhffs-intl vhffs-listengine vhffs-panel vhffs-robots vhffs-shells debian vhffs-tools);
 
@@ -82,7 +82,7 @@
 {
 	my $work	= 	shift;
 	my $tmp		=	shift;
-	my $output_file = $tmp."/VHFFS".$VERSION.".tgz";
+	my $output_file = $tmp."/vhffs".$VERSION.".tgz";
 	my $files;
 	foreach( @files_to_package )
 	{
@@ -91,6 +91,7 @@
 	my $commande = "tar cvvfz";
 	my $total = $commande." ".$output_file." vhffs-".$VERSION." 1>/dev/null 2>/dev/null";
 	system( "cd ".$work." && cd .. && " . $total );
+	system( "rm -rf $work");
 }
 
 

Modified: trunk/vhffs-shells/tuxshell
==============================================================================
Binary files - no diff available.