[Fusionforge-commits] r8415 - in branches/Branch_4_8: gforge gforge/deb-specific tools
Roland Mas
lolando at libremir.placard.fr.eu.org
Thu Nov 19 14:39:46 CET 2009
Author: lolando
Date: 2009-11-19 14:39:46 +0100 (Thu, 19 Nov 2009)
New Revision: 8415
Modified:
branches/Branch_4_8/gforge/deb-specific/install-cvs.sh
branches/Branch_4_8/gforge/fusionforge.spec
branches/Branch_4_8/tools/createplugin.sh
branches/Branch_4_8/tools/createtheme.sh
branches/Branch_4_8/tools/mirror-gforge.sh
branches/Branch_4_8/tools/replicate_gforge.sh
Log:
Finish /usr/lib/gforge ?\226?\134?\146 /usr/share/gforge migration
Modified: branches/Branch_4_8/gforge/deb-specific/install-cvs.sh
===================================================================
--- branches/Branch_4_8/gforge/deb-specific/install-cvs.sh 2009-11-19 10:04:04 UTC (rev 8414)
+++ branches/Branch_4_8/gforge/deb-specific/install-cvs.sh 2009-11-19 13:39:46 UTC (rev 8415)
@@ -15,9 +15,9 @@
echo "Modifying inetd for cvs server"
echo "CVS usual config is changed for gforge one"
# First, dedupe the commented lines
- update-inetd --remove "cvspserver stream tcp nowait.400 root /usr/sbin/tcpd /usr/lib/gforge/bin/cvs-pserver"
- update-inetd --remove "cvspserver stream tcp nowait.400 root /usr/sbin/tcpd /usr/lib/gforge/plugins/scmcvs/bin/cvs-pserver"
+ update-inetd --remove "cvspserver stream tcp nowait.400 root /usr/sbin/tcpd /usr/share/gforge/bin/cvs-pserver"
update-inetd --remove "cvspserver stream tcp nowait.400 root /usr/sbin/tcpd /usr/share/gforge/plugins/scmcvs/bin/cvs-pserver"
+ update-inetd --remove "cvspserver stream tcp nowait.400 root /usr/sbin/tcpd /usr/share/gforge/plugins/scmcvs/bin/cvs-pserver"
update-inetd --comment-chars "#SF_WAS_HERE#" --enable cvspserver
# Then, insinuate ourselves
update-inetd --comment-chars "#SF_WAS_HERE#" --disable cvspserver
Modified: branches/Branch_4_8/gforge/fusionforge.spec
===================================================================
--- branches/Branch_4_8/gforge/fusionforge.spec 2009-11-19 10:04:04 UTC (rev 8414)
+++ branches/Branch_4_8/gforge/fusionforge.spec 2009-11-19 13:39:46 UTC (rev 8415)
@@ -315,7 +315,7 @@
ln -s %{GFORGE_DIR}/www/env.inc.php %{PLUGINS_LIB_DIR}/env.inc.php
- #if not the env.inc.php include-path isn't correct //not necessary if no more /usr/lib/gforge
+ #if not the env.inc.php include-path isn't correct //not necessary if no more /usr/share/gforge
#ln -s %{PLUGINS_LIB_DIR} %{GFORGE_DIR}/plugins
else
Modified: branches/Branch_4_8/tools/createplugin.sh
===================================================================
--- branches/Branch_4_8/tools/createplugin.sh 2009-11-19 10:04:04 UTC (rev 8414)
+++ branches/Branch_4_8/tools/createplugin.sh 2009-11-19 13:39:46 UTC (rev 8415)
@@ -57,8 +57,8 @@
sub debug ( \$ ) ;
sub parse_sql_file ( \$ ) ;
-require ("/usr/lib/gforge/lib/include.pl") ; # Include a few predefined functions
-require ("/usr/lib/gforge/lib/sqlparser.pm") ; # Our magic SQL parser
+require ("/usr/share/gforge/lib/include.pl") ; # Include a few predefined functions
+require ("/usr/share/gforge/lib/sqlparser.pm") ; # Our magic SQL parser
debug "You'll see some debugging info during this installation." ;
debug "Do not worry unless told otherwise." ;
@@ -248,8 +248,8 @@
sub debug ( \$ ) ;
sub parse_sql_file ( \$ ) ;
-require ("/usr/lib/gforge/lib/include.pl") ; # Include a few predefined functions
-require ("/usr/lib/gforge/lib/sqlparser.pm") ; # Our magic SQL parser
+require ("/usr/share/gforge/lib/include.pl") ; # Include a few predefined functions
+require ("/usr/share/gforge/lib/sqlparser.pm") ; # Our magic SQL parser
debug "You'll see some debugging info during this installation." ;
debug "Do not worry unless told otherwise." ;
@@ -270,7 +270,7 @@
\$version = &get_db_version ;
\$target = "0.1" ;
if (is_lesser \$version, \$target) {
- my @filelist = ( "/usr/lib/gforge/plugins/\$pluginname/lib/\$pluginname-init.sql" ) ;
+ my @filelist = ( "/usr/share/gforge/plugins/\$pluginname/lib/\$pluginname-init.sql" ) ;
foreach my \$file (@filelist) {
debug "Processing \$file" ;
@@ -625,7 +625,7 @@
echo Creating $plugdir/debian/cron.d
cat > $plugdir/debian/cron.d <<FIN
-0 0 * * * gforge [ -x /usr/lib/gforge/plugins/$minus/bin/$minus ] && /usr/lib/gforge/plugins/$minus/bin/$minus > /dev/null 2>&1
+0 0 * * * gforge [ -x /usr/share/gforge/plugins/$minus/bin/$minus ] && /usr/share/gforge/plugins/$minus/bin/$minus > /dev/null 2>&1
FIN
echo Creating $plugdir/debian/dirs
@@ -682,8 +682,8 @@
case "\$1" in
configure)
- /usr/lib/gforge/plugins/$minus/bin/db-upgrade.pl
- /usr/lib/gforge/bin/register-plugin $minus "${fullname}"
+ /usr/share/gforge/plugins/$minus/bin/db-upgrade.pl
+ /usr/share/gforge/bin/register-plugin $minus "${fullname}"
invoke-rc.d apache reload
;;
@@ -820,9 +820,9 @@
case "\$1" in
remove|deconfigure)
- /usr/lib/gforge/bin/unregister-plugin $minus
+ /usr/share/gforge/bin/unregister-plugin $minus
invoke-rc.d apache reload
- /usr/lib/gforge/plugins/$minus/bin/db-delete.pl
+ /usr/share/gforge/plugins/$minus/bin/db-delete.pl
;;
upgrade|failed-upgrade)
;;
@@ -882,19 +882,19 @@
dh_clean -k
dh_installdirs
- cp -r bin/* \$(DESTDIR)/usr/lib/gforge/plugins/\$(PLUGIN)/bin/
- cp -r include/* \$(DESTDIR)/usr/lib/gforge/plugins/\$(PLUGIN)/include/
- cp -r lib/* \$(DESTDIR)/usr/lib/gforge/plugins/\$(PLUGIN)/lib/
- # cp -r cgi-bin/* \$(DESTDIR)/usr/lib/gforge/plugins/\$(PLUGIN)/cgi-bin/
+ cp -r bin/* \$(DESTDIR)/usr/share/gforge/plugins/\$(PLUGIN)/bin/
+ cp -r include/* \$(DESTDIR)/usr/share/gforge/plugins/\$(PLUGIN)/include/
+ cp -r lib/* \$(DESTDIR)/usr/share/gforge/plugins/\$(PLUGIN)/lib/
+ # cp -r cgi-bin/* \$(DESTDIR)/usr/share/gforge/plugins/\$(PLUGIN)/cgi-bin/
cp -r etc/* \$(DESTDIR)/etc/gforge/plugins/\$(PLUGIN)/
cp -r www/* \$(DESTDIR)/usr/share/gforge/www/plugins/\$(PLUGIN)/
install -m 0644 httpd.conf \$(DESTDIR)/etc/gforge/httpd.d/50\$(PLUGIN)
# install -m 0600 httpd.secrets \$(DESTDIR)/etc/gforge/httpd.secrets.d/50\$(PLUGIN)
find \$(DESTDIR)/ -name CVS -type d | xargs rm -rf
- find \$(DESTDIR)/usr/lib/gforge/plugins/\$(PLUGIN)/bin/ -type f | xargs chmod 0755
- find \$(DESTDIR)/usr/lib/gforge/plugins/\$(PLUGIN)/include/ -type f | xargs chmod 0644
- find \$(DESTDIR)/usr/lib/gforge/plugins/\$(PLUGIN)/lib/ -type f | xargs chmod 0644
- # find \$(DESTDIR)/usr/lib/gforge/plugins/\$(PLUGIN)/cgi-bin/ -type f | xargs chmod 0755
+ find \$(DESTDIR)/usr/share/gforge/plugins/\$(PLUGIN)/bin/ -type f | xargs chmod 0755
+ find \$(DESTDIR)/usr/share/gforge/plugins/\$(PLUGIN)/include/ -type f | xargs chmod 0644
+ find \$(DESTDIR)/usr/share/gforge/plugins/\$(PLUGIN)/lib/ -type f | xargs chmod 0644
+ # find \$(DESTDIR)/usr/share/gforge/plugins/\$(PLUGIN)/cgi-bin/ -type f | xargs chmod 0755
find \$(DESTDIR)/etc/gforge/plugins/\$(PLUGIN)/ -type f | xargs chmod 0644
find \$(DESTDIR)/usr/share/gforge/www/plugins/\$(PLUGIN)/ -type f | xargs chmod 0644
Modified: branches/Branch_4_8/tools/createtheme.sh
===================================================================
--- branches/Branch_4_8/tools/createtheme.sh 2009-11-19 10:04:04 UTC (rev 8414)
+++ branches/Branch_4_8/tools/createtheme.sh 2009-11-19 13:39:46 UTC (rev 8415)
@@ -138,7 +138,7 @@
case "\$1" in
configure)
# Add the theme
- /usr/lib/gforge/bin/register-theme "$minus" "$fullname"
+ /usr/share/gforge/bin/register-theme "$minus" "$fullname"
;;
abort-upgrade|abort-remove|abort-deconfigure)
@@ -199,7 +199,7 @@
find \$(CURDIR)/debian/$themedir/usr/share/gforge/ -name CVS -type d | xargs rm -rf
find \$(CURDIR)/debian/$themedir/usr/share/gforge/www -type d -exec chmod 0755 {} \;
find \$(CURDIR)/debian/$themedir/usr/share/gforge/www -type f -exec chmod 0644 {} \;
- mkdir -p \$(CURDIR)/debian/$themedir/usr/lib/gforge/bin
+ mkdir -p \$(CURDIR)/debian/$themedir/usr/share/gforge/bin
binary-indep: build install
dh_testdir
@@ -258,7 +258,7 @@
case "\$1" in
remove|deconfigure)
- /usr/lib/gforge/bin/unregister-theme $minus
+ /usr/share/gforge/bin/unregister-theme $minus
;;
upgrade|failed-upgrade)
;;
Modified: branches/Branch_4_8/tools/mirror-gforge.sh
===================================================================
--- branches/Branch_4_8/tools/mirror-gforge.sh 2009-11-19 10:04:04 UTC (rev 8414)
+++ branches/Branch_4_8/tools/mirror-gforge.sh 2009-11-19 13:39:46 UTC (rev 8415)
@@ -134,10 +134,10 @@
[ -f $DBDUMPFILE ] && /bin/cp $DBDUMPFILE $DBDUMPFILE.orig
[ -f $DBDUMPFILE ] && log "Adjusting $DBDUMPFILE" && perl -pi -e "s/connect - sourceforge/connect - gforge/" $DBDUMPFILE
[ -f $DBDUMPFILE ] && log "Adjusting database for new site" && perl -pi -e "s/$SRCSERVER/$DSTSERVER/" $DBDUMPFILE
- log "running /usr/lib/gforge/bin/install-db.sh restore $DBDUMPFILE"
- /usr/lib/gforge/bin/install-db.sh restore $DBDUMPFILE >>$LOGFILE 2>&1
- log "su -s /bin/sh gforge -c /usr/lib/gforge/bin/db-upgrade.pl"
- su -s /bin/sh gforge -c /usr/lib/gforge/bin/db-upgrade.pl >>$LOGFILE 2>&1
+ log "running /usr/share/gforge/bin/install-db.sh restore $DBDUMPFILE"
+ /usr/share/gforge/bin/install-db.sh restore $DBDUMPFILE >>$LOGFILE 2>&1
+ log "su -s /bin/sh gforge -c /usr/share/gforge/bin/db-upgrade.pl"
+ su -s /bin/sh gforge -c /usr/share/gforge/bin/db-upgrade.pl >>$LOGFILE 2>&1
log "Removing user sessions from database"
su -s /bin/sh - $DBNAME psql $DBNAME >> $LOGFILE 2>&1 <<-END
delete from user_session ;
Modified: branches/Branch_4_8/tools/replicate_gforge.sh
===================================================================
--- branches/Branch_4_8/tools/replicate_gforge.sh 2009-11-19 10:04:04 UTC (rev 8414)
+++ branches/Branch_4_8/tools/replicate_gforge.sh 2009-11-19 13:39:46 UTC (rev 8415)
@@ -25,8 +25,8 @@
ssh root@$OLDSFSERVER "su -s /bin/sh $OLDDB -c \"/usr/lib/postgresql/bin/pg_dump $OLDDB\"" > /root/db_dump_$OLDDB
[ -f /root/db_dump_$OLDDB ] && echo "Adjusting /root/db_dump_$OLDDB" && perl -pi -e "s/connect - sourceforge/connect - gforge/" /root/db_dump_$OLDDB
fi
- /usr/lib/gforge/bin/install-db.sh restore /root/db_dump_$OLDDB
- su -s /bin/sh gforge -c /usr/lib/gforge/bin/db-upgrade.pl
+ /usr/share/gforge/bin/install-db.sh restore /root/db_dump_$OLDDB
+ su -s /bin/sh gforge -c /usr/share/gforge/bin/db-upgrade.pl
fi
if [ $SYNC_FILE == 1 ]
More information about the Fusionforge-commits
mailing list