| 1 |
Author: <hromojaro@dia.uned.es>
|
| 2 |
Description:
|
| 3 |
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/etc/install/functions.sh trunk/etc/install/functions.sh
|
| 4 |
--- trunk~/etc/install/functions.sh 2004-04-25 11:32:27.000000000 +0200
|
| 5 |
+++ trunk/etc/install/functions.sh 2010-05-19 13:03:51.000000000 +0200
|
| 6 |
@@ -23,10 +23,10 @@
|
| 7 |
|
| 8 |
interactive=$1
|
| 9 |
|
| 10 |
- if [ "$interactive" == "yes" ]; then
|
| 11 |
+ if [ "$interactive" = "yes" ]; then
|
| 12 |
echo "Continue? (y/n)"
|
| 13 |
read continue
|
| 14 |
- if [ "$continue" == "n" ]; then
|
| 15 |
+ if [ "$continue" = "n" ]; then
|
| 16 |
echo "$0: exiting on users request"
|
| 17 |
exit
|
| 18 |
fi
|
| 19 |
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/etc/install/install-and-alert.sh trunk/etc/install/install-and-alert.sh
|
| 20 |
--- trunk~/etc/install/install-and-alert.sh 2003-11-04 15:39:04.000000000 +0100
|
| 21 |
+++ trunk/etc/install/install-and-alert.sh 2010-05-19 13:13:13.000000000 +0200
|
| 22 |
@@ -12,11 +12,11 @@
|
| 23 |
script_path=$(dirname $(which $0))
|
| 24 |
cd $script_path
|
| 25 |
|
| 26 |
-source ./functions.sh
|
| 27 |
+. ./functions.sh
|
| 28 |
|
| 29 |
# Get a proper environment set up
|
| 30 |
if [ -f ~/.bashrc ]; then
|
| 31 |
- source ~/.bashrc
|
| 32 |
+ . ~/.bashrc
|
| 33 |
fi
|
| 34 |
|
| 35 |
# Look for two-part command line arguments
|
| 36 |
@@ -28,20 +28,20 @@
|
| 37 |
server_overridden="no"
|
| 38 |
for arg in "$@"
|
| 39 |
do
|
| 40 |
- if [ $config_val_next == "1" ]; then
|
| 41 |
+ if [ $config_val_next = "1" ]; then
|
| 42 |
export config_file=$arg
|
| 43 |
config_val_next=0
|
| 44 |
fi
|
| 45 |
- if [ $server_next == "1" ]; then
|
| 46 |
+ if [ $server_next = "1" ]; then
|
| 47 |
# Overrides server setting in config file
|
| 48 |
export server=$arg
|
| 49 |
server_next=0
|
| 50 |
server_overridden="yes"
|
| 51 |
fi
|
| 52 |
- if [ $arg == "--config-file" ]; then
|
| 53 |
+ if [ $arg = "--config-file" ]; then
|
| 54 |
config_val_next=1
|
| 55 |
fi
|
| 56 |
- if [ $arg == "--server" ]; then
|
| 57 |
+ if [ $arg = "--server" ]; then
|
| 58 |
server_next=1
|
| 59 |
fi
|
| 60 |
done
|
| 61 |
@@ -62,7 +62,7 @@
|
| 62 |
mkdir -p $output_dir
|
| 63 |
fi
|
| 64 |
installation_output_file="${output_dir}/installation-output"
|
| 65 |
-./install.sh $@ &> $installation_output_file
|
| 66 |
+./install.sh $@ >$installation_output_file 2>&1
|
| 67 |
|
| 68 |
# Get lines with alert keywords or lines with failed TclWebtest tests
|
| 69 |
error_lines=$(egrep -i "(FAILED: .+\.test)|($alert_keyword)" $installation_output_file)
|
| 70 |
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/etc/install/server-output/service0/installation-output trunk/etc/install/server-output/service0/installation-output
|
| 71 |
--- trunk~/etc/install/server-output/service0/installation-output 1970-01-01 01:00:00.000000000 +0100
|
| 72 |
+++ trunk/etc/install/server-output/service0/installation-output 2010-05-19 13:13:22.000000000 +0200
|
| 73 |
@@ -0,0 +1 @@
|
| 74 |
+mié may 19 13:13:22 CEST 2010: You must execute this script as root; exiting
|
| 75 |
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/etc/install/warn-if-installation-errors.sh trunk/etc/install/warn-if-installation-errors.sh
|
| 76 |
--- trunk~/etc/install/warn-if-installation-errors.sh 2003-11-04 15:39:04.000000000 +0100
|
| 77 |
+++ trunk/etc/install/warn-if-installation-errors.sh 2010-05-19 12:59:40.000000000 +0200
|
| 78 |
@@ -9,7 +9,7 @@
|
| 79 |
|
| 80 |
file_name=$1
|
| 81 |
|
| 82 |
-source ./functions.sh
|
| 83 |
+. ./functions.sh
|
| 84 |
|
| 85 |
alert_keyword=`get_config_param alert_keyword`
|
| 86 |
|
| 87 |
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/packages/acs-lang/bin/check-catalog.sh trunk/packages/acs-lang/bin/check-catalog.sh
|
| 88 |
--- trunk~/packages/acs-lang/bin/check-catalog.sh 2003-10-30 14:10:53.000000000 +0100
|
| 89 |
+++ trunk/packages/acs-lang/bin/check-catalog.sh 2010-05-19 12:57:02.000000000 +0200
|
| 90 |
@@ -34,7 +34,7 @@
|
| 91 |
export script_path=$(dirname $(which $0))
|
| 92 |
|
| 93 |
### Functions start
|
| 94 |
-source ${script_path}/functions.sh
|
| 95 |
+. ${script_path}/functions.sh
|
| 96 |
|
| 97 |
get_date_time_key() {
|
| 98 |
message_key=$1
|
| 99 |
@@ -72,7 +72,7 @@
|
| 100 |
do
|
| 101 |
catalog_package_version=$(cat $catalog_file | ${script_path}/mygrep '<message_catalog .*package_version="([^"]+)"')
|
| 102 |
|
| 103 |
- if [ ! "$info_file_package_version" == "$catalog_package_version" ]; then
|
| 104 |
+ if [ ! "$info_file_package_version" = "$catalog_package_version" ]; then
|
| 105 |
echo "$0: $package_key - Warning: package version $catalog_package_version in file $catalog_file does not equal version $info_file_package_version in info file."
|
| 106 |
fi
|
| 107 |
done
|
| 108 |
@@ -152,7 +152,7 @@
|
| 109 |
find_dirs="$packages_dir ${packages_dir}../www"
|
| 110 |
|
| 111 |
# Process arguments
|
| 112 |
-if [ "$#" == "0" ]; then
|
| 113 |
+if [ "$#" = "0" ]; then
|
| 114 |
# No package provided - check all packages
|
| 115 |
for catalog_dir in $(find $package_dir -iname catalog -type d)
|
| 116 |
do
|
| 117 |
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/packages/acs-lang/bin/list-keys.sh trunk/packages/acs-lang/bin/list-keys.sh
|
| 118 |
--- trunk~/packages/acs-lang/bin/list-keys.sh 2003-10-31 13:58:29.000000000 +0100
|
| 119 |
+++ trunk/packages/acs-lang/bin/list-keys.sh 2010-05-19 12:58:25.000000000 +0200
|
| 120 |
@@ -5,7 +5,7 @@
|
| 121 |
# @author Peter Marklund
|
| 122 |
|
| 123 |
export script_path=$(dirname $(which $0))
|
| 124 |
-source ${script_path}/functions.sh
|
| 125 |
+. ${script_path}/functions.sh
|
| 126 |
|
| 127 |
for en_us_file in $(find_en_us_files)
|
| 128 |
do
|
Parent Directory
| 
Revision Log