From 57b3b484433f93755077f54226d7c8283984609b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 14 Feb 2012 16:04:03 +0100 Subject: [PATCH 1/4] Remove ancient script for upgrading configuration --- scripts/convertcfg.pl | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100755 scripts/convertcfg.pl diff --git a/scripts/convertcfg.pl b/scripts/convertcfg.pl deleted file mode 100755 index 69010fde0c..0000000000 --- a/scripts/convertcfg.pl +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/perl -# -# -# Configuration converter -# Converts from old-style (Pre-2.3) configuration files to new format found in PMA-2.3 -# -# Takes input from STDIN, sends output to STDOUT -# - -while(<>) -{ s/\$cfg(\w+)/\$cfg\[\'$1\'\]/g; - print; - } - - From 419948cc9e9d1b99e2cfb68ad24b0f83bea40496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 14 Feb 2012 16:04:21 +0100 Subject: [PATCH 2/4] Remove semi-broken script for upgrading --- scripts/upgrade.pl | 222 --------------------------------------------- 1 file changed, 222 deletions(-) delete mode 100755 scripts/upgrade.pl diff --git a/scripts/upgrade.pl b/scripts/upgrade.pl deleted file mode 100755 index 7f142940ba..0000000000 --- a/scripts/upgrade.pl +++ /dev/null @@ -1,222 +0,0 @@ -#!/usr/bin/perl -# -# -# upgrade.pl - automatic phpmyadmin upgrader -# -# -# 2005-05-08, swix@users.sourceforge.net: -# - created script -# -# 2005-10-29 swix@users.sourceforge.net: -# - some fixes & improvements -# - -use strict; -my $source_url = "http://phpmyadmin.net/home_page/version.php"; - - -# -# usage -# - -if (!$ARGV[0] || (($ARGV[0] eq "--force") && !$ARGV[1])) { - print "\n"; - print "usage: $0 [--force] \n\n"; - print " The location specified by will be backed up and replaced\n"; - print " by the latest stable version of phpMyAdmin.\n"; - print " Your config.inc.php file will be preserved.\n\n"; - exit(0); -} - -my $forced; -my $targetdirectory; - -if ($ARGV[0] eq "--force") { - $forced = 1; - $targetdirectory = $ARGV[1]; -} else { - $forced = 0; - $targetdirectory = $ARGV[0]; -} - -if ($targetdirectory =~ /^(.*)\/$/) { - # remove trailing slash, if any - $targetdirectory = $1; -} - -if (!-d $targetdirectory) { - print "error: target directory ($targetdirectory) does not exists\n"; - exit(0); -} - -if (!-f "$targetdirectory/config.inc.php") { - print "error: target directory doesn't seem to contain phpMyAdmin\n"; - exit(0); -} - - -# -# get current release information -# - -my $version; -my $filename; -my $directory; -my $releasedate; -my @urls; -my @today; -my $installedversion; - -if (open(LATEST, "wget -o /dev/null -O - $source_url|")) { - - $version = ; chomp($version); - $releasedate = ; chomp($releasedate); - $filename = "phpMyAdmin-" . $version . "-all-languages.tar.gz"; - $directory = "phpMyAdmin-" . $version . "-all-languages"; - - my $i = 0; - - while (my $line = ) { - chomp($line); - if ($line =~ /http/) { - $urls[$i++] = $line; - } - } - - close(LATEST); - -} else { - - print "error: open of $source_url failed.\n"; - exit(0); - -} - - -if (-d $directory) { - print "error: target directory ($directory) already exists, exiting\n"; - exit(0); -} - -# -# check the installed version -# - -if (open(DEFINES, $targetdirectory .'/libraries/Config.class.php')) { - my $versionStatus = 0; - $installedversion = "unknownversion"; - - while (my $line = ) { - - next unless $line =~ /'PMA_VERSION',\ '(.*)?'\);$/; - $installedversion = $1; - - # take care of "pl", "rc" and "dev": dev < rc < pl - - my $converted_installedversion = $installedversion; - $converted_installedversion =~ s/dev/aaa/g; - $converted_installedversion =~ s/rc/bbb/g; - $converted_installedversion =~ s/pl/ccc/g; - - my $converted_version = $version; - $converted_version =~ s/dev/aaa/g; - $converted_version =~ s/rc/bbb/g; - $converted_version =~ s/pl/ccc/g; - - if ($converted_installedversion gt $converted_version && !$forced) { - print "Local version ($installedversion) newer than latest stable release ($version), not updating. (use \"--force\")\n"; - exit(0); - - } elsif ($installedversion eq $version && !$forced) { - print "Local version ($version) already up to date, not updating (you can use \"--force\")\n"; - exit(0); - - } else { - $versionStatus = 1; - } - } - if (!$versionStatus && !$forced) { - print "Old version could not be identified, not updating (use \"--force\" if you are sure) \n"; - exit(0); - } -} - -# -# ask for confirmation -# - -print "\n"; -print "phpMyAdmin upgrade summary:\n"; -print "---------------------------\n"; -print " phpMyAdmin Path: $targetdirectory\n"; -print " Installed version: $installedversion\n"; -print " Upgraded version: $version\n\n"; -print "Proceed with upgrade? [Y/n] "; -my $kbdinput = ; chomp($kbdinput); -if (lc(substr($kbdinput,0,1)) ne "y" && length($kbdinput) >= 1) { - print "Aborting.\n"; - exit(0); -} else { - print "Proceeding...\n\n"; -} - - -# -# get file -# - -if (!-f $filename) { - - print "getting phpMyAdmin $version\n"; - foreach my $url (@urls) { - - print "trying $url...\n"; - system("wget -o /dev/null $url"); - if (-f $filename) { - print "-> ok\n"; - last; - } - } -} else { - print "already got $filename, not downloading\n"; -} - - -if (!-f $filename) { - print "error: $filename download failed\n"; - exit(0); -} - - - -# -# setup -# - -print "installing...\n"; - -system("tar xzf $filename"); -if (!$directory) { - print "error: $directory still not exists after untar...\n"; - exit(0); -} - -@today = localtime(time); $today[4]++; $today[5]+=1900; -my $timestamp = sprintf("%04d%02d%02d%02d%02d", $today[5], $today[4], $today[3], $today[2], $today[1]); - -my $backupdir = $targetdirectory . "-" . $timestamp . "-" . $installedversion; -print "- backup directory: $backupdir\n"; - -system("cp $directory/config.inc.php $directory/config.inc-dist.php"); -print "- original distribution config.inc.php renamed to config.inc-dist.php\n"; - -system("cp $targetdirectory/config.inc.php $directory/config.inc.php"); -print "- previous config.inc.php copied to the new setup\n"; - -system("mv $targetdirectory $backupdir"); -system("mv $directory $targetdirectory"); -system("rm $filename"); - -print "\ndone! phpMyAdmin $version installed in $targetdirectory\n"; -print "backup of your old installation in $backupdir\n"; -print "Enjoy! :-)\n\n"; From 29b566d7d382651a8a19a1e800cfa6210a4f911c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 14 Feb 2012 16:05:30 +0100 Subject: [PATCH 3/4] Drop php to gettext conversion script This was needed only for conversion from php based translation to gettext. --- scripts/php2gettext.sh | 116 ----------------------------------------- 1 file changed, 116 deletions(-) delete mode 100755 scripts/php2gettext.sh diff --git a/scripts/php2gettext.sh b/scripts/php2gettext.sh deleted file mode 100755 index c4df85030a..0000000000 --- a/scripts/php2gettext.sh +++ /dev/null @@ -1,116 +0,0 @@ -#!/bin/sh - -set -e - -mkdir -p po - - -sed " - s/' ;/';/; - /to translate/D; - /\$allow_recoding/D; - s/\$byteUnits = array('\(.*\)', '\(.*\)', '\(.*\)', '\(.*\)', '\(.*\)', '\(.*\)', '\(.*\)');/\$str_B = '\1';\n\$str_KiB = '\2';\n\$str_MiB = '\3';\n\$str_GiB = '\4';\n\$str_TiB = '\5';\n\$str_PiB = '\6';\n\$str_EiB = '\7';/; - s/\$day_of_week = array('\(.*\)', '\(.*\)', '\(.*\)', '\(.*\)', '\(.*\)', '\(.*\)', '\(.*\)');/\$str_Sun = '\1';\n\$str_Mon = '\2';\n\$str_Tue = '\3';\n\$str_Wed = '\4';\n\$str_Thu = '\5';\n\$str_Fri = '\6';\n\$str_Sat = '\7';\n/; - s/\(\$month = array('.*', '.*', '.*', '.*', '.*', '.*',\) '\(.*\)', '\(.*\)', '\(.*\)', '\(.*\)', '\(.*\)', '\(.*\)');/\1\n\$str_Jul = '\2';\n\$str_Aug = '\3';\n\$str_Sep = '\4';\n\$str_Oct = '\5';\n\$str_Nov = '\6';\n\$str_Dec = '\7';\n/; - s/\$month = array('\(.*\)', '\(.*\)', '\(.*\)', '\(.*\)', '\(.*\)', '\(.*\)',/\$str_Jan = '\1';\n\$str_Feb = '\2';\n\$str_Mar = '\3';\n\$str_Apr = '\4';\n\$str_May = '\5';\n\$str_Jun = '\6';\n/; - " < lang/english-utf-8.inc.php > po/english.php - -for lang in lang/*.inc.php ; do - loc=`basename $lang | sed 's/-utf-8.inc.php//'` - # Unfold arrays, delete not translated strings - sed " - s/' ;/';/; - /to translate/D; - /^\/\//D; - /\$allow_recoding/D; - s/\$byteUnits *= *array('\(.*\)', *'\(.*\)', *'\(.*\)', *'\(.*\)', *'\(.*\)', *'\(.*\)', *'\(.*\)');/\$str_B = '\1';\n\$str_KiB = '\2';\n\$str_MiB = '\3';\n\$str_GiB = '\4';\n\$str_TiB = '\5';\n\$str_PiB = '\6';\n\$str_EiB = '\7';/; - s/\$day_of_week *= *array('\(.*\)', *'\(.*\)', *'\(.*\)', *'\(.*\)', *'\(.*\)', *'\(.*\)', *'\(.*\)');/\$str_Sun = '\1';\n\$str_Mon = '\2';\n\$str_Tue = '\3';\n\$str_Wed = '\4';\n\$str_Thu = '\5';\n\$str_Fri = '\6';\n\$str_Sat = '\7';\n/; - s/\(\$month *= *array('.*', *'.*', *'.*', *'.*', *'.*', *'.*',\) '\(.*\)', *'\(.*\)', *'\(.*\)', *'\(.*\)', *'\(.*\)', *'\(.*\)');/\1\n\$str_Jul = '\2';\n\$str_Aug = '\3';\n\$str_Sep = '\4';\n\$str_Oct = '\5';\n\$str_Nov = '\6';\n\$str_Dec = '\7';\n/; - s/\$month *= *array('\(.*\)', *'\(.*\)', *'\(.*\)', *'\(.*\)', *'\(.*\)', *'\(.*\)',/\$str_Jan = '\1';\n\$str_Feb = '\2';\n\$str_Mar = '\3';\n\$str_Apr = '\4';\n\$str_May = '\5';\n\$str_Jun = '\6';\n/; - " < $lang > po/$loc.php - - case $loc in - afrikaans) langcode='af';; - arabic) langcode='ar';; - azerbaijani) langcode='az';; - bangla) langcode='bn';; - belarusian_cyrillic) langcode='be';; - belarusian_latin) langcode='be@latin';; - bulgarian) langcode='bg';; - bosnian) langcode='bs';; - catalan) langcode='ca';; - czech) langcode='cs';; - danish) langcode='da';; - german) langcode='de';; - greek) langcode='el';; - english) langcode='en';; - english-gb) langcode='en_GB';; - spanish) langcode='es';; - estonian) langcode='et';; - basque) langcode='eu';; - persian) langcode='fa';; - finnish) langcode='fi';; - french) langcode='fr';; - galician) langcode='gl';; - hebrew) langcode='he';; - hindi) langcode='hi';; - croatian) langcode='hr';; - hungarian) langcode='hu';; - indonesian) langcode='id';; - italian) langcode='it';; - japanese) langcode='ja';; - korean) langcode='ko';; - georgian) langcode='ka';; - lithuanian) langcode='lt';; - latvian) langcode='lv';; - macedonian_cyrillic) langcode='mk';; - mongolian) langcode='mn';; - malay) langcode='ms';; - dutch) langcode='nl';; - norwegian) langcode='nb';; - polish) langcode='pl';; - brazilian_portuguese) langcode='pt_BR';; - portuguese) langcode='pt';; - romanian) langcode='ro';; - russian) langcode='ru';; - sinhala) langcode='si';; - slovak) langcode='sk';; - slovenian) langcode='sl';; - albanian) langcode='sq';; - serbian_latin) langcode='sr@latin';; - serbian_cyrillic) langcode='sr';; - swedish) langcode='sv';; - thai) langcode='th';; - turkish) langcode='tr';; - tatarish) langcode='tt';; - ukrainian) langcode='uk';; - chinese_traditional) langcode='zh_TW';; - chinese_simplified) langcode='zh_CN';; - uzbek_cyrillic) langcode='uz';; - uzbek_latin) langcode='uz@latin';; - *) echo "Wrong loc: $loc"; exit 1;; - esac - - echo "$loc -> $langcode" - if [ $langcode = en ] ; then - php2po -i po/english.php -o po/phpmyadmin-update.pot -P - sed -i ' - s/PACKAGE VERSION/phpMyAdmin 3.4/; - s/Report-Msgid-Bugs-To: .*\\n/Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\\n/; - ' po/phpmyadmin-update.pot - else - php2po -t po/english.php -i po/$loc.php -o po/$langcode-update.po - sed -i " - s/PACKAGE VERSION/phpMyAdmin 3.4/; - /, fuzzy/D; - s/LANGUAGE /$loc <$langcode@li.org>/; - s/YEAR-MO-DA HO:MI+ZONE/`date +'%Y-%m-%d %H:%M%z'`/; - s/FULL NAME /Automatically generated/; - s/Report-Msgid-Bugs-To: .*\\\\n/Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\\\\n/; - " po/$langcode-update.po - ./scripts/mergepo.py po/$langcode.po po/$langcode-update.po - msgmerge -U -C po/$langcode-update.po po/$langcode.po po/phpmyadmin.pot - rm po/$langcode-update.po po/$loc.php - fi -done -rm po/english.php po/phpmyadmin-update.pot From 1e8f066a091bd1fcd75dd22b66746a7000f20a23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 14 Feb 2012 16:07:43 +0100 Subject: [PATCH 4/4] Remove whole scripts directory from release This is only useful for developers now (user content was moved to examples) and thus is useless to ship. --- scripts/create-release.sh | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 72c74959bd..f3ef79e78d 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -139,14 +139,6 @@ echo "* Removing unneeded files" # if someone runs /test/wui.php and there are test failures rm -rf test -# Remove javascript compiler, no need to ship it -rm -rf scripts/google-javascript-compiler/ - -# Remove scripts which are not useful for user -for s in compress-js create-release.sh generate-mo mergepo.py php2gettext.sh remove_control_m.sh update-po upload-release pending-po pendingpo.py ; do - rm -f scripts/$s -done - # Remove git metadata rm -rf .git find . -name .gitignore -print0 | xargs -0 -r rm -f @@ -162,7 +154,7 @@ for kit in $KITS ; do # Cleanup translations cd phpMyAdmin-$version-$kit scripts/lang-cleanup.sh $kit - rm -f scripts/lang-cleanup.sh + rm -f scripts cd .. # Remove tar file possibly left from previous run