Browse Source

Fixes issue 3564: s/License/Licence/ where applicable in linux installer

Change-Id: I2f5169ebc3a58efa00e80c28be15b27d9ab6ed50
Reviewed-on: http://gerrit.dmdirc.com/782
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>
tags/0.6.3b1
Gregory Holmes 14 years ago
parent
commit
86472a2b87
3 changed files with 20 additions and 20 deletions
  1. 18
    18
      installer/linux/installjre.sh
  2. 1
    1
      src/com/dmdirc/installer/ui/StepWelcome.java
  3. 1
    1
      src/overview.html

+ 18
- 18
installer/linux/installjre.sh View File

60
 	exit 1;
60
 	exit 1;
61
 fi;
61
 fi;
62
 
62
 
63
-showLicense() {
64
-	# Get License Text
65
-	FILE=`mktemp license.XXXXXXXXXXXXXX`
63
+showLicence() {
64
+	# Get Licence Text
65
+	FILE=`mktemp licence.XXXXXXXXXXXXXX`
66
 	if [ "${ISFREEBSD}" != "" ]; then
66
 	if [ "${ISFREEBSD}" != "" ]; then
67
 		WGET=`which wget`
67
 		WGET=`which wget`
68
 		FETCH=`which fetch`
68
 		FETCH=`which fetch`
80
 			${CURL} -s -o ${FILE} ${URL}
80
 			${CURL} -s -o ${FILE} ${URL}
81
 		fi;
81
 		fi;
82
 	else
82
 	else
83
-		# Location of license start
83
+		# Location of licence start
84
 		STARTLINE=`grep ${GREPOPTS} "^more <<\"EOF\"$" jre.bin`
84
 		STARTLINE=`grep ${GREPOPTS} "^more <<\"EOF\"$" jre.bin`
85
 		STARTLINE=$((${STARTLINE%%:*} + 1))
85
 		STARTLINE=$((${STARTLINE%%:*} + 1))
86
-		# Location of license end
87
-		ENDLINE=`grep ${GREPOPTS} "Do you agree to the above license terms?" jre.bin`
86
+		# Location of licence end
87
+		ENDLINE=`grep ${GREPOPTS} "Do you agree to the above licence terms?" jre.bin`
88
 		ENDLINE=$((${ENDLINE%%:*} - 4))
88
 		ENDLINE=$((${ENDLINE%%:*} - 4))
89
 		
89
 		
90
 		head -n ${ENDLINE} jre.bin | tail ${TAILOPTS}${STARTLINE} > ${FILE}
90
 		head -n ${ENDLINE} jre.bin | tail ${TAILOPTS}${STARTLINE} > ${FILE}
93
 	# Send text to console.
93
 	# Send text to console.
94
 	echo ""
94
 	echo ""
95
 	echo "-----------------------------------------------------------------------"
95
 	echo "-----------------------------------------------------------------------"
96
-	echo "Java License"
96
+	echo "Java Licence"
97
 	echo "-----------------------------------------------------------------------"
97
 	echo "-----------------------------------------------------------------------"
98
 	cat ${FILE}
98
 	cat ${FILE}
99
 	echo "-----------------------------------------------------------------------"
99
 	echo "-----------------------------------------------------------------------"
101
 	# Now try to use the GUI Dialogs.
101
 	# Now try to use the GUI Dialogs.
102
 	if [ "" != "${ISKDE}" -a "" != "${KDIALOG}" -a "" != "${DISPLAY}" ]; then
102
 	if [ "" != "${ISKDE}" -a "" != "${KDIALOG}" -a "" != "${DISPLAY}" ]; then
103
 		echo "Dialog on Display: ${DISPLAY}"
103
 		echo "Dialog on Display: ${DISPLAY}"
104
-		${KDIALOG} --title "DMDirc: Java License" --textbox ${FILE} 600 400
104
+		${KDIALOG} --title "DMDirc: Java Licence" --textbox ${FILE} 600 400
105
 	elif [ "" != "${ISGNOME}" -a "" != "${ZENITY}" -a "" != "${DISPLAY}" ]; then
105
 	elif [ "" != "${ISGNOME}" -a "" != "${ZENITY}" -a "" != "${DISPLAY}" ]; then
106
 		echo "Dialog on Display: ${DISPLAY}"
106
 		echo "Dialog on Display: ${DISPLAY}"
107
-		${ZENITY} --text-info --title "DMDirc: Java License" --filename=${FILE} --width=600 --height=400
107
+		${ZENITY} --text-info --title "DMDirc: Java Licence" --filename=${FILE} --width=600 --height=400
108
 	fi
108
 	fi
109
 	
109
 	
110
 	# Remove temp file
110
 	# Remove temp file
120
 	fi;
120
 	fi;
121
 fi;
121
 fi;
122
 
122
 
123
-messagedialog "Java Install" "Before java can be installed, please review the following license."
124
-showLicense
125
-questiondialog "Java Install" "Do you agree to the Java License?"
123
+messagedialog "Java Install" "Before java can be installed, please review the following licence."
124
+showLicence
125
+questiondialog "Java Install" "Do you agree to the Java Licence?"
126
 if [ $? -eq 0 ]; then
126
 if [ $? -eq 0 ]; then
127
 	if [ "${ISFREEBSD}" != "" ]; then
127
 	if [ "${ISFREEBSD}" != "" ]; then
128
 		JREJAVAHOME="diablo-jre1.6.0_07"
128
 		JREJAVAHOME="diablo-jre1.6.0_07"
153
 			tar -jxvf jre.tar.bz2
153
 			tar -jxvf jre.tar.bz2
154
 			mv jre.tar.bz2 jre.bin
154
 			mv jre.tar.bz2 jre.bin
155
 		else
155
 		else
156
-			# Hack jre.bin to allow us to install without asking for a license, or failing
156
+			# Hack jre.bin to allow us to install without asking for a licence, or failing
157
 			# the checksum.
157
 			# the checksum.
158
 			
158
 			
159
-			# Location of license start
159
+			# Location of licence start
160
 			STARTLINE=`grep ${GREPOPTS} "^more <<\"EOF\"$" jre.bin`
160
 			STARTLINE=`grep ${GREPOPTS} "^more <<\"EOF\"$" jre.bin`
161
 			STARTLINE=${STARTLINE%%:*}
161
 			STARTLINE=${STARTLINE%%:*}
162
-			# Location of license end
163
-			ENDLINE=`grep ${GREPOPTS} "Do you agree to the above license terms?" jre.bin`
162
+			# Location of licence end
163
+			ENDLINE=`grep ${GREPOPTS} "Do you agree to the above licence terms?" jre.bin`
164
 			ENDLINE=$((${ENDLINE%%:*} - 2))
164
 			ENDLINE=$((${ENDLINE%%:*} - 2))
165
 			# Location of checksum start
165
 			# Location of checksum start
166
 			CSSTARTLINE=`grep ${GREPOPTS} "^if \[ -x /usr/bin/sum \]; then$" jre.bin`
166
 			CSSTARTLINE=`grep ${GREPOPTS} "^if \[ -x /usr/bin/sum \]; then$" jre.bin`
171
 			# Location of script end
171
 			# Location of script end
172
 			SCENDLINE=`grep ${GREPOPTS} "^echo \"Done.\"$" jre.bin`
172
 			SCENDLINE=`grep ${GREPOPTS} "^echo \"Done.\"$" jre.bin`
173
 			SCENDLINE=$((${SCENDLINE%%:*} + 2 - (${ENDLINE} - ${STARTLINE}) - (${CSENDLINE} - ${CSSTARTLINE})))
173
 			SCENDLINE=$((${SCENDLINE%%:*} + 2 - (${ENDLINE} - ${STARTLINE}) - (${CSENDLINE} - ${CSSTARTLINE})))
174
-			# Remove the license and checksum stuff!
174
+			# Remove the licence and checksum stuff!
175
 			head -n $((${STARTLINE} -1)) jre.bin > jre.bin.tmp
175
 			head -n $((${STARTLINE} -1)) jre.bin > jre.bin.tmp
176
 			tail ${TAILOPTS}$((${ENDLINE})) jre.bin | head -n $((${CSSTARTLINE} -1 - ${ENDLINE})) >> jre.bin.tmp
176
 			tail ${TAILOPTS}$((${ENDLINE})) jre.bin | head -n $((${CSSTARTLINE} -1 - ${ENDLINE})) >> jre.bin.tmp
177
 			echo "tail \${tail_args} +${SCENDLINE} \"\$0\" > \$outname" >> jre.bin.tmp
177
 			echo "tail \${tail_args} +${SCENDLINE} \"\$0\" > \$outname" >> jre.bin.tmp
234
 		exit 0;
234
 		exit 0;
235
 	fi;
235
 	fi;
236
 else
236
 else
237
-	errordialog "Java Install" "You must agree to the license before java can be installed"
237
+	errordialog "Java Install" "You must agree to the licence before java can be installed"
238
 fi;
238
 fi;
239
 exit 1;
239
 exit 1;

+ 1
- 1
src/com/dmdirc/installer/ui/StepWelcome.java View File

52
                 "will install DMDirc on this computer.\n\nDMDirc is a " +
52
                 "will install DMDirc on this computer.\n\nDMDirc is a " +
53
                 "cross-platform IRC client developed by Chris Smith, Shane " +
53
                 "cross-platform IRC client developed by Chris Smith, Shane " +
54
                 "Mc Cormack and Gregory Holmes. DMDirc is released for free " +
54
                 "Mc Cormack and Gregory Holmes. DMDirc is released for free " +
55
-                "under the MIT license; for more information, please visit " +
55
+                "under the MIT licence; for more information, please visit " +
56
                 "www.DMDirc.com.\n\nClick \"Next\" to continue, or close " +
56
                 "www.DMDirc.com.\n\nClick \"Next\" to continue, or close " +
57
                 "this program to cancel the installation."), BorderLayout.CENTER);
57
                 "this program to cancel the installation."), BorderLayout.CENTER);
58
     }
58
     }

+ 1
- 1
src/overview.html View File

21
  SOFTWARE.
21
  SOFTWARE.
22
 </head>
22
 </head>
23
 <body>
23
 <body>
24
-DMDirc is a new cross platform IRC client written in java, it is being developed under the MIT license by 
24
+DMDirc is a new cross platform IRC client written in java, it is being developed under the MIT licence by
25
      <a href="http://www.md87.co.uk" title="MD87">Chris 'MD87' Smith</a>, <a href="http://www.greboid.com" title="Greboid">
25
      <a href="http://www.md87.co.uk" title="MD87">Chris 'MD87' Smith</a>, <a href="http://www.greboid.com" title="Greboid">
26
      Greg 'Greboid' Holmes</a> and <a href="http://home.dataforce.org.uk" title="Dataforce">Shane 'Dataforce' Mc Cormack</a>.
26
      Greg 'Greboid' Holmes</a> and <a href="http://home.dataforce.org.uk" title="Dataforce">Shane 'Dataforce' Mc Cormack</a>.
27
      <p>DMDirc was started to address the lack of a good IRC client for Linux, it can however be run on any java capable platform, 
27
      <p>DMDirc was started to address the lack of a good IRC client for Linux, it can however be run on any java capable platform, 

Loading…
Cancel
Save