| [vhffs-dev] [svn] commit: r233 - in /trunk: Makefile vhffs-backend/conf/vhffs.conf |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
Author: gradator
Date: Sat Oct 21 04:13:23 2006
New Revision: 233
Log:
fixed tuxshell location, conflict with /usr/bin/tuxshell and /bin/tuxshell, rewrote ugly tuxshell part in Makefile
Modified:
trunk/Makefile
trunk/vhffs-backend/conf/vhffs.conf
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sat Oct 21 04:13:23 2006
@@ -1,19 +1,19 @@
#!/usr/bin/make
-CONFDIR = $(DESTDIR)/etc/vhffs/
-DOCDIR = $(DESTDIR)/usr/share/doc/vhffs/
-APIDIR = $(DESTDIR)/usr/share/vhffs/api/
-PANELDIR = $(DESTDIR)/usr/share/vhffs/panel/
-TEMPLATESDIR = $(DESTDIR)/usr/share/vhffs/templates/
-BACKENDDIR = $(DESTDIR)/usr/share/vhffs/backend/
-INTLDIR = $(DESTDIR)/usr/share/vhffs/intl/
-BOTSDIR = $(DESTDIR)/usr/lib/vhffs/bots/
-LEDIR = $(DESTDIR)/usr/lib/vhffs/listengine/
-TOOLSDIR = $(DESTDIR)/usr/bin/
-SHELLDIR = $(DESTDIR)/usr/bin/
-JABBERDIR = $(DESTDIR)/usr/share/vhffs/jabber/
-LEWEB = $(DESTDIR)/usr/share/vhffs/listengine/
-MAILSDIR = $(DESTDIR)/usr/share/vhffs/mails/
+CONFDIR = $(DESTDIR)/etc/vhffs
+DOCDIR = $(DESTDIR)/usr/share/doc/vhffs
+APIDIR = $(DESTDIR)/usr/share/vhffs/api
+PANELDIR = $(DESTDIR)/usr/share/vhffs/panel
+TEMPLATESDIR = $(DESTDIR)/usr/share/vhffs/templates
+BACKENDDIR = $(DESTDIR)/usr/share/vhffs/backend
+INTLDIR = $(DESTDIR)/usr/share/vhffs/intl
+BOTSDIR = $(DESTDIR)/usr/lib/vhffs/bots
+LEDIR = $(DESTDIR)/usr/lib/vhffs/listengine
+TOOLSDIR = $(DESTDIR)/usr/bin
+SHELLDIR = $(DESTDIR)/usr/bin
+JABBERDIR = $(DESTDIR)/usr/share/vhffs/jabber
+LEWEB = $(DESTDIR)/usr/share/vhffs/listengine
+MAILSDIR = $(DESTDIR)/usr/share/vhffs/mails
PERL_MODULES=HTML::Template Digest::MD5 CGI Locale::gettext Config::General DBI Email::Valid Crypt::PasswdMD5 GD::Text::Wrap GD MIME::Lite XML::RSS CGI::Session Encode utf8 LockFile::Simple Mail::Internet Email::Valid Time::ParseDate
DEBIAN_PACKAGES=libxml-rss-perl liblocale-gettext-perl libconfig-general-perl libhtml-template-perl libcrypt-passwdmd5-perl libgd-text-perl libmime-lite-perl libcgi-session-perl liblockfile-simple-perl libgd-gd2-perl libclass-dbi-pg-perl libclass-dbi-perl libdbd-pg-perl libemail-valid-perl libc6-dev libtime-modules-perl
@@ -69,7 +69,7 @@
} \
unlink( \$$link ) if( -f \$$link ); \
(symlink( \"$(DESTDIR)/usr/share/vhffs/api\" , \$$link ) && print \"Link API with \$$link\n\") || \
- print \"** WARNING ** Unable to create symlink, please link /usr/share/vhffs/api with Vhffs in a perl include directory, please contact Vhffs team\";"
+ print \"** WARNING ** Unable to create symlink, please link /usr/share/vhffs/api with Vhffs in a perl include directory, please contact Vhffs team\n\";"
build-shell:
install -d -m 755 $(SHELLDIR)
@@ -77,7 +77,7 @@
add-shell:
install -d -m 755 $(DESTDIR)/etc
- if [ -f $(DESTDIR)/etc/shells ]; then sed "s/\/bin\/tuxshell//" $(DESTDIR)/etc/shells > shells.tmp ; echo "/bin/tuxshell" >> shells.tmp ; cp -f shells.tmp $(DESTDIR)/etc/shells ; rm -f shells.tmp ; else echo "/bin/tuxshell" >> $(DESTDIR)/etc/shells ; fi
+ if [ -f $(DESTDIR)/etc/shells ]; then grep -c "$(SHELLDIR)/tuxshell" $(DESTDIR)/etc/shells > /dev/null ; if [ $? -ne 0 ]; then echo "$(SHELLDIR)/tuxshell" >> $(DESTDIR)/etc/shells ; fi ; else echo "$(SHELLDIR)/tuxshell" > $(DESTDIR)/etc/shells ; fi
install-bots:
install -d -m 755 $(BOTSDIR)
Modified: trunk/vhffs-backend/conf/vhffs.conf
==============================================================================
--- trunk/vhffs-backend/conf/vhffs.conf (original)
+++ trunk/vhffs-backend/conf/vhffs.conf Sat Oct 21 04:13:23 2006
@@ -148,7 +148,7 @@
<users>
minuid = 10000
homedir = /home/
- shell = /bin/tuxshell
+ shell = /usr/bin/tuxshell
mingid = 10000
default_quota = 50
bad_username_file = /etc/vhffs/badfile