You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2025/02/12 17:39:28 UTC
(openoffice) branch AOO42X updated (432d064f00 -> 35b2f94752)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a change to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
from 432d064f00 Revert "wiped" nodes and avoid saving history elements
new dcee7c1d1c poll.pl: use lowercase HTML tags (#276)
new 35b2f94752 pre-commit: trim trailing whitespace in more files (#278)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
extras/l10n/source/fix_l10n.sh | 2 +-
main/desktop/scripts/mozwrapper.sh | 8 +--
main/desktop/scripts/sbase.sh | 8 +--
main/desktop/scripts/scalc.sh | 8 +--
main/desktop/scripts/sdraw.sh | 8 +--
main/desktop/scripts/simpress.sh | 8 +--
main/desktop/scripts/smaster.sh | 8 +--
main/desktop/scripts/smath.sh | 8 +--
main/desktop/scripts/soffice.sh | 8 +--
main/desktop/scripts/sweb.sh | 8 +--
main/desktop/scripts/swriter.sh | 8 +--
main/desktop/scripts/unoinfo.sh | 8 +--
main/desktop/scripts/unopkg.sh | 12 ++--
.../inc_openoffice/unix/find-requires-gnome.sh | 8 +--
.../inc_openoffice/unix/find-requires-x11.sh | 8 +--
main/odk/pack/copying/addsym-macosx.sh | 8 +--
main/padmin/source/spadmin.sh | 10 +--
main/pyuno/zipcore/python.sh | 10 +--
main/sal/qa/helper/gcov/gcov_run.sh | 8 +--
main/sd/res/webview/poll.pl | 16 ++---
main/setup_native/scripts/downloadscript.sh | 10 +--
main/setup_native/scripts/install_linux.sh | 30 ++++-----
main/setup_native/scripts/install_solaris.sh | 52 ++++++++--------
main/setup_native/scripts/javaloader.sh | 72 +++++++++++-----------
main/setup_native/scripts/langpackscript.sh | 8 +--
main/setup_native/scripts/linuxpatchscript.sh | 12 ++--
main/setup_native/scripts/stclient_wrapper.sh | 12 ++--
main/setup_native/scripts/uninstall_linux.sh | 10 +--
main/setup_native/scripts/uninstall_solaris.sh | 8 +--
main/setup_native/scripts/unpack_update.sh | 8 +--
main/setup_native/scripts/update.sh | 28 ++++-----
main/shell/source/unix/exec/urltest.sh | 8 +--
main/shell/source/unix/misc/cde-open-url.sh | 8 +--
main/shell/source/unix/misc/gnome-open-url.sh | 8 +--
main/shell/source/unix/misc/kde-open-url.sh | 8 +--
main/shell/source/unix/misc/open-url.sh | 14 ++---
main/slideshow/qa/debug/colors.sh | 8 +--
main/slideshow/qa/debug/nodetree.sh | 20 +++---
main/solenv/bin/addsym-macosx.sh | 8 +--
main/solenv/bin/addsym-mingw.sh | 10 +--
main/solenv/bin/checkdll.sh | 8 +--
main/solenv/bin/soirpm.sh | 8 +--
main/source_soenv.sh | 8 +--
main/sysui/desktop/share/create_tree.sh | 8 +--
main/sysui/desktop/share/openoffice.sh | 8 +--
main/sysui/desktop/share/printeradmin.sh | 10 +--
main/toolkit/src2xml/dryrunall.sh | 8 +--
main/toolkit/src2xml/sc.sh | 8 +--
main/toolkit/src2xml/sd.sh | 8 +--
main/toolkit/src2xml/sw.sh | 8 +--
main/toolkit/workben/layout/un-test.sh | 8 +--
main/ure/source/startup.sh | 8 +--
main/writerfilter/source/ooxml/efforts.sh | 8 +--
main/writerfilter/source/ooxml/stage1.sh | 10 +--
54 files changed, 314 insertions(+), 314 deletions(-)
(openoffice) 02/02: pre-commit: trim trailing whitespace in more files (#278)
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 35b2f9475203b90a62e22e5b9e8d1b79b0f5a107
Author: John Bampton <jb...@users.noreply.github.com>
AuthorDate: Thu Feb 13 03:37:38 2025 +1000
pre-commit: trim trailing whitespace in more files (#278)
(cherry picked from commit b339e61b0e4c15004c00f5d1a4e0671656d90a8f)
---
extras/l10n/source/fix_l10n.sh | 2 +-
main/desktop/scripts/mozwrapper.sh | 8 +--
main/desktop/scripts/sbase.sh | 8 +--
main/desktop/scripts/scalc.sh | 8 +--
main/desktop/scripts/sdraw.sh | 8 +--
main/desktop/scripts/simpress.sh | 8 +--
main/desktop/scripts/smaster.sh | 8 +--
main/desktop/scripts/smath.sh | 8 +--
main/desktop/scripts/soffice.sh | 8 +--
main/desktop/scripts/sweb.sh | 8 +--
main/desktop/scripts/swriter.sh | 8 +--
main/desktop/scripts/unoinfo.sh | 8 +--
main/desktop/scripts/unopkg.sh | 12 ++--
.../inc_openoffice/unix/find-requires-gnome.sh | 8 +--
.../inc_openoffice/unix/find-requires-x11.sh | 8 +--
main/odk/pack/copying/addsym-macosx.sh | 8 +--
main/padmin/source/spadmin.sh | 10 +--
main/pyuno/zipcore/python.sh | 10 +--
main/sal/qa/helper/gcov/gcov_run.sh | 8 +--
main/setup_native/scripts/downloadscript.sh | 10 +--
main/setup_native/scripts/install_linux.sh | 30 ++++-----
main/setup_native/scripts/install_solaris.sh | 52 ++++++++--------
main/setup_native/scripts/javaloader.sh | 72 +++++++++++-----------
main/setup_native/scripts/langpackscript.sh | 8 +--
main/setup_native/scripts/linuxpatchscript.sh | 12 ++--
main/setup_native/scripts/stclient_wrapper.sh | 12 ++--
main/setup_native/scripts/uninstall_linux.sh | 10 +--
main/setup_native/scripts/uninstall_solaris.sh | 8 +--
main/setup_native/scripts/unpack_update.sh | 8 +--
main/setup_native/scripts/update.sh | 28 ++++-----
main/shell/source/unix/exec/urltest.sh | 8 +--
main/shell/source/unix/misc/cde-open-url.sh | 8 +--
main/shell/source/unix/misc/gnome-open-url.sh | 8 +--
main/shell/source/unix/misc/kde-open-url.sh | 8 +--
main/shell/source/unix/misc/open-url.sh | 14 ++---
main/slideshow/qa/debug/colors.sh | 8 +--
main/slideshow/qa/debug/nodetree.sh | 20 +++---
main/solenv/bin/addsym-macosx.sh | 8 +--
main/solenv/bin/addsym-mingw.sh | 10 +--
main/solenv/bin/checkdll.sh | 8 +--
main/solenv/bin/soirpm.sh | 8 +--
main/source_soenv.sh | 8 +--
main/sysui/desktop/share/create_tree.sh | 8 +--
main/sysui/desktop/share/openoffice.sh | 8 +--
main/sysui/desktop/share/printeradmin.sh | 10 +--
main/toolkit/src2xml/dryrunall.sh | 8 +--
main/toolkit/src2xml/sc.sh | 8 +--
main/toolkit/src2xml/sd.sh | 8 +--
main/toolkit/src2xml/sw.sh | 8 +--
main/toolkit/workben/layout/un-test.sh | 8 +--
main/ure/source/startup.sh | 8 +--
main/writerfilter/source/ooxml/efforts.sh | 8 +--
main/writerfilter/source/ooxml/stage1.sh | 10 +--
53 files changed, 306 insertions(+), 306 deletions(-)
diff --git a/extras/l10n/source/fix_l10n.sh b/extras/l10n/source/fix_l10n.sh
index 96ded9b26b..376b5b13be 100755
--- a/extras/l10n/source/fix_l10n.sh
+++ b/extras/l10n/source/fix_l10n.sh
@@ -8,7 +8,7 @@ if ( $# < 2 ) then
echo "e.g. fix_l10n.sh s/test/ivo/g *.sdf"
echo "or fix_l10n.sh 's/abc<ctrl+v+tab>/abcx<ctrl+v+tab/'"
exit( -1 )
-endif
+endif
foreach file ( $files )
echo "Processing $1 on file $file"
diff --git a/main/desktop/scripts/mozwrapper.sh b/main/desktop/scripts/mozwrapper.sh
index db52b94356..b90bac6355 100644
--- a/main/desktop/scripts/mozwrapper.sh
+++ b/main/desktop/scripts/mozwrapper.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
# if mozilla is not found, specify full path here
diff --git a/main/desktop/scripts/sbase.sh b/main/desktop/scripts/sbase.sh
index 1e750c0bb7..e034a482d5 100644
--- a/main/desktop/scripts/sbase.sh
+++ b/main/desktop/scripts/sbase.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
cmd=`dirname "$0"`/soffice
diff --git a/main/desktop/scripts/scalc.sh b/main/desktop/scripts/scalc.sh
index a9b8df3ee7..32b6f60fa3 100644
--- a/main/desktop/scripts/scalc.sh
+++ b/main/desktop/scripts/scalc.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
cmd=`dirname "$0"`/soffice
diff --git a/main/desktop/scripts/sdraw.sh b/main/desktop/scripts/sdraw.sh
index 904bd72828..f2bbc7fee0 100644
--- a/main/desktop/scripts/sdraw.sh
+++ b/main/desktop/scripts/sdraw.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
cmd=`dirname "$0"`/soffice
diff --git a/main/desktop/scripts/simpress.sh b/main/desktop/scripts/simpress.sh
index 8e84448173..b40de4a544 100644
--- a/main/desktop/scripts/simpress.sh
+++ b/main/desktop/scripts/simpress.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
cmd=`dirname "$0"`/soffice
diff --git a/main/desktop/scripts/smaster.sh b/main/desktop/scripts/smaster.sh
index 953d7d58cc..fb6218ea75 100644
--- a/main/desktop/scripts/smaster.sh
+++ b/main/desktop/scripts/smaster.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
cmd=`dirname "$0"`/soffice
diff --git a/main/desktop/scripts/smath.sh b/main/desktop/scripts/smath.sh
index 581afe2e19..288da9b1f8 100644
--- a/main/desktop/scripts/smath.sh
+++ b/main/desktop/scripts/smath.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
cmd=`dirname "$0"`/soffice
diff --git a/main/desktop/scripts/soffice.sh b/main/desktop/scripts/soffice.sh
index d380cab27c..1bf8af89be 100644
--- a/main/desktop/scripts/soffice.sh
+++ b/main/desktop/scripts/soffice.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
#
diff --git a/main/desktop/scripts/sweb.sh b/main/desktop/scripts/sweb.sh
index 6a814bd5f7..cb2a19baba 100644
--- a/main/desktop/scripts/sweb.sh
+++ b/main/desktop/scripts/sweb.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
cmd=`dirname "$0"`/soffice
diff --git a/main/desktop/scripts/swriter.sh b/main/desktop/scripts/swriter.sh
index 86e74a6759..e7403f5090 100644
--- a/main/desktop/scripts/swriter.sh
+++ b/main/desktop/scripts/swriter.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
cmd=`dirname "$0"`/soffice
diff --git a/main/desktop/scripts/unoinfo.sh b/main/desktop/scripts/unoinfo.sh
index 8f1876526a..1a22a48bf2 100644
--- a/main/desktop/scripts/unoinfo.sh
+++ b/main/desktop/scripts/unoinfo.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
set -e
diff --git a/main/desktop/scripts/unopkg.sh b/main/desktop/scripts/unopkg.sh
index b9d24b8e3c..a2ee0352ee 100644
--- a/main/desktop/scripts/unopkg.sh
+++ b/main/desktop/scripts/unopkg.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
# enable file locking
@@ -46,12 +46,12 @@ do
-env:*) BOOTSTRAPVARS=$BOOTSTRAPVARS" ""$arg";;
sync) OPTSYNC=true;;
-v) VERBOSE=true;;
- --verbose) VERBOSE=true;;
+ --verbose) VERBOSE=true;;
*) OPTOTHER=$arg;;
esac
done
-if [ "$OPTSYNC" = "true" ] && [ -z "$OPTOTHER" ]
+if [ "$OPTSYNC" = "true" ] && [ -z "$OPTOTHER" ]
then
JVMFWKPARAMS='-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml -env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
fi
diff --git a/main/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh b/main/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
index 288ce589cb..78e31f47e9 100644
--- a/main/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
+++ b/main/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
cat > /dev/null
diff --git a/main/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh b/main/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
index 852899cda7..30036669e9 100644
--- a/main/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
+++ b/main/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
cat > /dev/null
diff --git a/main/odk/pack/copying/addsym-macosx.sh b/main/odk/pack/copying/addsym-macosx.sh
index b8b537e47b..82b43b44e8 100755
--- a/main/odk/pack/copying/addsym-macosx.sh
+++ b/main/odk/pack/copying/addsym-macosx.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
# This script is needed in the process of generating exported
diff --git a/main/padmin/source/spadmin.sh b/main/padmin/source/spadmin.sh
index 7100108d3b..cf1869dc3b 100644
--- a/main/padmin/source/spadmin.sh
+++ b/main/padmin/source/spadmin.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
# enable file locking
@@ -28,7 +28,7 @@ export SAL_ENABLE_FILE_LOCKING
sd_cwd="`pwd`"
if [ -h "$0" ] ; then
sd_basename=`basename "$0"`
- sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"`
+ sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"`
cd "`dirname "$0"`"
cd "`dirname "$sd_script"`"
else
diff --git a/main/pyuno/zipcore/python.sh b/main/pyuno/zipcore/python.sh
index f5998afcc4..69a8b09c67 100644
--- a/main/pyuno/zipcore/python.sh
+++ b/main/pyuno/zipcore/python.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,23 +8,23 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
# resolve installation directory
sd_cwd="`pwd`"
if [ -h "$0" ] ; then
sd_basename=`basename "$0"`
- sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"`
+ sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"`
cd "`dirname "$0"`"
cd "`dirname "$sd_script"`"
else
diff --git a/main/sal/qa/helper/gcov/gcov_run.sh b/main/sal/qa/helper/gcov/gcov_run.sh
index cd9429ea7d..7f4ca338a8 100755
--- a/main/sal/qa/helper/gcov/gcov_run.sh
+++ b/main/sal/qa/helper/gcov/gcov_run.sh
@@ -1,6 +1,6 @@
#!/bin/tcsh -f
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
# This is a helper file, to start a coverage test by hand
diff --git a/main/setup_native/scripts/downloadscript.sh b/main/setup_native/scripts/downloadscript.sh
index be0d296f66..ed6945d3e0 100644
--- a/main/setup_native/scripts/downloadscript.sh
+++ b/main/setup_native/scripts/downloadscript.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
linenum=LINENUMBERPLACEHOLDER
@@ -82,7 +82,7 @@ if [ -x /usr/bin/sum ] ; then
sum=`$tail_prog +$linenum $0 | /usr/bin/sum`
sum=`echo $sum | awk '{ print $1 }'`
-
+
if [ $sum != $checksum ]; then
echo "The download file appears to be corrupted. Please download PRODUCTNAMEPLACEHOLDER again."
exit 1
diff --git a/main/setup_native/scripts/install_linux.sh b/main/setup_native/scripts/install_linux.sh
index 463c0cfac9..5ad12a54ab 100644
--- a/main/setup_native/scripts/install_linux.sh
+++ b/main/setup_native/scripts/install_linux.sh
@@ -1,6 +1,6 @@
#!/bin/bash
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
ADD="no"
@@ -30,10 +30,10 @@ help()
{
echo
echo "User Mode Installation script for developer and knowledgeable early access tester"
- echo
+ echo
echo "This installation method is not intended for use in a production environment!"
echo "Using this script is unsupported and completely at your own risk"
- echo
+ echo
echo "Usage:" $0 [-lU] "<rpm-source-dir> <office-installation-dir>"
echo " <rpm-source-dir>: directory *only* containing the Linux rpm packages to be installed"
echo " or language pack shell script containing the rpm packages"
@@ -63,9 +63,9 @@ try_to_unpack_languagepack_file()
else
printf "\nERROR: First parameter $FILENAME is a file, but no language pack shell script.\n"
echo $USAGE
- exit 2
+ exit 2
fi
-
+
echo "Unpacking shell script $FILENAME"
TAILLINE=`head --lines=20 $FILENAME | sed --quiet 's/linenum=//p'`
@@ -76,7 +76,7 @@ try_to_unpack_languagepack_file()
# Setting the new package path, in which the packages exist
PACKAGE_PATH=$UNPACKDIR
-
+
# Setting variable UPDATE, because an Office installation has to exist, if a language pack shall be installed
UPDATE="yes"
}
@@ -120,7 +120,7 @@ fi
PACKAGE_PATH=$1
#
-# If the first parameter is a shell script (download installation set), the packages have to
+# If the first parameter is a shell script (download installation set), the packages have to
# be unpacked into temp directory
#
@@ -150,7 +150,7 @@ else
fi
#
-# Determine whether this should be an update or a fresh install
+# Determine whether this should be an update or a fresh install
#
INSTALLDIR=$2
@@ -159,7 +159,7 @@ RPM_DB_PATH=${INSTALLDIR}/var/lib/rpm
# Check for versionrc
if [ -f ${INSTALLDIR}/program/versionrc ]; then VERSIONRC=versionrc; fi
-if [ "$UPDATE" = "ask" ]
+if [ "$UPDATE" = "ask" ]
then
PRODUCT=`sed --silent -e "
/^buildid=/ {
@@ -218,7 +218,7 @@ then
if [ ! "${RPM_DB_PATH:0:1}" = "/" ]; then
RPM_DB_PATH=`cd ${RPM_DB_PATH}; pwd`
fi
-
+
# we should use --freshen for updates to not add languages with patches, but this will break
# language packs, so leave it for now ..
# RPMCMD="--freshen"
@@ -245,7 +245,7 @@ else
if [ "$ADD" = "no" ]; then
rpm --initdb --dbpath $RPM_DB_PATH
fi
-
+
# Default install command
RPMCMD="--install"
fi
@@ -265,7 +265,7 @@ for i in $RPMLIST ; do
done
#
-# Perform the installation
+# Perform the installation
#
echo
diff --git a/main/setup_native/scripts/install_solaris.sh b/main/setup_native/scripts/install_solaris.sh
index 6f0b1c08dd..40a74c1048 100644
--- a/main/setup_native/scripts/install_solaris.sh
+++ b/main/setup_native/scripts/install_solaris.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
ADD="no"
@@ -27,12 +27,12 @@ USAGE="Usage: $0 [-a] [-l] [-h] <pkg-source-dir> <office-installation-dir>"
help()
{
- echo
+ echo
echo "User Mode Installation script for developer and knowledgeable early access tester"
- echo
+ echo
echo "This installation method is not intended for use in a production environment!"
echo "Using this script is unsupported and completely at your own risk"
- echo
+ echo
echo "Usage:" $0 "<pkg-source-dir> <office-installation-dir> [-l]"
echo " <pkg-source-dir>: directory *only* containing the Solaris pkg packages to be installed"
echo " or language pack shell script containing the Solaris pkg packages"
@@ -60,13 +60,13 @@ try_to_unpack_languagepack_file()
else
printf "\nERROR: First parameter $FILENAME is a file, but no language pack shell script.\n"
echo $USAGE
- exit 2
+ exit 2
fi
-
+
echo "Unpacking shell script $FILENAME"
# TAILLINE=`head -n 20 $FILENAME | sed --quiet 's/linenum=//p'`
TAILLINE=`head -n 20 $FILENAME | sed -n 's/linenum=//p'`
-
+
if [ -x "/usr/bin/mktemp" ] # available in Solaris 10
then
UNPACKDIR=`mktemp -d`
@@ -74,13 +74,13 @@ try_to_unpack_languagepack_file()
UNPACKDIR=/var/tmp/install_$$
mkdir $UNPACKDIR
fi
-
+
echo $UNPACKDIR
tail +$TAILLINE $FILENAME | gunzip | (cd $UNPACKDIR; tar xvf -)
# Setting the new package path, in which the packages exist
PACKAGE_PATH=$UNPACKDIR
-
+
# Setting variable UPDATE, because an Office installation has to exist, if a language pack shall be installed
UPDATE="yes"
}
@@ -135,7 +135,7 @@ then
fi
# Determine whether this is a patch or a regular install set ..
-/bin/bash -c "ls $1/*/patchinfo >/dev/null 2>&1"
+/bin/bash -c "ls $1/*/patchinfo >/dev/null 2>&1"
if [ "$?" = 0 ]
then
UPDATE="yes"
@@ -156,7 +156,7 @@ else
fi
#
- # If the first parameter is a shell script (download installation set), the packages have to
+ # If the first parameter is a shell script (download installation set), the packages have to
# be unpacked into temp directory
#
if [ -f "$PACKAGE_PATH" ]
@@ -167,7 +167,7 @@ else
#
# Create sed filter script for unwanted packages
#
-
+
cat > /tmp/userinstall_filer.$$ << EOF
/SUNWadabas/d
/^SUNWj[0-9]/d
@@ -175,12 +175,12 @@ else
/-shared-mime-info/d
/-cde/d
EOF
-
+
# Do not install gnome-integration package on systems without GNOME
pkginfo -q SUNWgnome-vfs
if [ $? -ne 0 ]
then
-
+
echo '/-gnome/d' >> /tmp/userinstall_filer.$$
fi
@@ -189,20 +189,20 @@ EOF
if [ ! -x $PKGDEP ]; then
PKGDEP="get_pkg_list"
fi
-
+
#
# Get the list of packages to install
#
-
+
PKG_LIST=`$PKGDEP $PACKAGE_PATH | sed -f /tmp/userinstall_filer.$$`
rm -f /tmp/userinstall_filer.$$
-
+
if [ -z "$PKG_LIST" ]
then
printf "\n$0: No packages found in $PACKAGE_PATH\n"
exit 2
fi
-
+
echo "Packages found:"
for i in $PKG_LIST ; do
echo $i
@@ -289,7 +289,7 @@ linenum=???
tail +$linenum $0 > $GETUID_SO
#
-# Perform the installation
+# Perform the installation
#
if [ "$UPDATE" = "yes" ]
then
@@ -305,11 +305,11 @@ then
mkdir -p ${INSTALL_ROOT}/var/sadm/system/admin 2>/dev/null
cp -f /var/sadm/system/admin/INST_RELEASE ${INSTALL_ROOT}/var/sadm/system/admin/INST_RELEASE
fi
-
+
# The case UPDATE="yes" is valid for patch installation and for language packs.
# For patches the variable PKG_LIST is empty, for language packs it is not empty.
# Patches have to be installed with patchadd, language packs with pkgadd
-
+
if [ -z "${PKG_LIST}" ]
then
LD_PRELOAD_32=$GETUID_SO /usr/sbin/patchadd -R ${INSTALL_ROOT} -M ${PATCH_PATH} ${PATCH_LIST} 2>&1 | grep -v '/var/sadm/patch' || pkg_error
@@ -323,11 +323,11 @@ else
for i in ${PKG_LIST}; do
mkdir -m 0755 -p ${INSTALL_ROOT}`pkgparam -d ${PACKAGE_PATH} $i BASEDIR` 2>/dev/null
done
-
+
if [ ! "${INSTALL_ROOT:0:1}" = "/" ]; then
INSTALL_ROOT=`cd ${INSTALL_ROOT}; pwd`
fi
-
+
echo "####################################################################"
echo "# Installation of the found packages #"
echo "####################################################################"
diff --git a/main/setup_native/scripts/javaloader.sh b/main/setup_native/scripts/javaloader.sh
index f474321a32..17317a6293 100644
--- a/main/setup_native/scripts/javaloader.sh
+++ b/main/setup_native/scripts/javaloader.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
jarfilename="JavaSetup.jar"
@@ -64,7 +64,7 @@ start_java()
if [ "x" != "x$jrefile" ]; then
jrecopy=-DJRE_FILE=$jrefile
fi
-
+
# run the installer class file
echo $java_runtime $home $log_module_states $getuid_path $jrecopy -jar $jarfilename
$java_runtime $home $log_module_states $getuid_path $jrecopy -jar $jarfilename
@@ -84,7 +84,7 @@ do_exit()
exitstring="$exitstring (exit code $errorcode)"
fi
- # simply echo the exitstring or open a xterm
+ # simply echo the exitstring or open a xterm
# -> dependent from tty
if tty ; then
@@ -105,27 +105,27 @@ EOF
# searching for xterm in path
xtermname="xterm"
- xtermfound="no";
+ xtermfound="no";
for i in `echo $PATH | sed -e 's/^:/.:/g' -e 's/:$/:./g' -e 's/::/:.:/g' -e 's/:/ /g'`; do
if [ -x "$i/$xtermname" -a ! -d "$i/$xtermname" ]; then
xtermname="$i/$xtermname"
- xtermfound="yes"
+ xtermfound="yes"
break
fi
- done
-
+ done
+
if [ $xtermfound = "no" -a "`uname -s`" = "SunOS" ]; then
if [ -x /usr/openwin/bin/xterm ]; then
xtermname=/usr/openwin/bin/xterm
xtermfound="yes"
- fi
+ fi
fi
-
+
if [ $xtermfound = "yes" ]; then
$xtermname -e $errorfile
fi
fi
-
+
cleanup
exit $errorcode
@@ -146,7 +146,7 @@ set_jre_for_uninstall()
if [ ! -f $packagepath/$jrefile ]; then
errortext="Error: Java Runtime Environment (JRE) not found in directory: $packagepath"
errorcode="4"
- do_exit
+ do_exit
fi
fi
}
@@ -154,10 +154,10 @@ set_jre_for_uninstall()
install_linux_rpm()
{
# Linux requires usage of rpm2cpio to install JRE with user privileges
- # 1. --relocate /usr/java=/var/tmp does not work, because not all files are
+ # 1. --relocate /usr/java=/var/tmp does not work, because not all files are
# relocatable. Some are always installed into /etc
# 2. --root only works with root privileges. With user privileges only the
- # database is shifted, but not the files.
+ # database is shifted, but not the files.
# On Linux currently rpm2cpio is required (and rpm anyhow)
@@ -170,7 +170,7 @@ install_linux_rpm()
fi
find_rpm()
-
+
if [ ! "$rpm_found" = "yes" ]; then
errortext="Error: Did not find rpm. rpm is currently required for installations on Linux."
errorcode="12"
@@ -197,7 +197,7 @@ install_linux_rpm()
if [ ! -f $packagepath/$jrefile ]; then
errortext="Error: Java Runtime Environment (JRE) not found in directory: $packagepath"
errorcode="4"
- do_exit
+ do_exit
fi
PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar lib/javaws.jar lib/deploy.jar"
@@ -208,7 +208,7 @@ install_linux_rpm()
tempjrefile=$tempdir/$jrefile
cp $packagepath/$jrefile $tempjrefile
-
+
if [ ! -f "$tempjrefile" ]; then
errortext="Error: Failed to copy Java Runtime Environment (JRE) temporarily."
errorcode="5"
@@ -249,7 +249,7 @@ install_linux_rpm()
;;
esac
done
-
+
# echo "Checksum 1: A1: $sumA1 B1: $sumB1"
# echo "Checksum 2: A2: $sumA2 B2: $sumB2"
@@ -261,7 +261,7 @@ install_linux_rpm()
else
echo "Can't find /usr/bin/sum to do checksum. Continuing anyway."
fi
-
+
# start to install jre
echo "Extracting ..."
olddir=`pwd`
@@ -286,7 +286,7 @@ install_linux_rpm()
UNPACK_EXE=$javahome/bin/unpack200
if [ -f $UNPACK_EXE ]; then
- chmod +x $UNPACK_EXE
+ chmod +x $UNPACK_EXE
packerror=""
for i in $PACKED_JARS; do
if [ -f $javahome/`dirname $i`/`basename $i .jar`.pack ]; then
@@ -304,7 +304,7 @@ install_linux_rpm()
rm -f $javahome/`dirname $i`/`basename $i .jar`.pack
fi
done
- if [ "$packerror" = "1" ]; then
+ if [ "$packerror" = "1" ]; then
if [ -d $javahome ]; then
/bin/rm -rf $javahome
fi
@@ -332,7 +332,7 @@ install_linux_rpm()
if [ x$ARCH = "x32" ] && [ -f "$javahome/bin/java" ]; then
"$javahome/bin/java" -client -Xshare:dump > /dev/null 2>&1
fi
-
+
java_runtime=$tempdir/$javahome/bin/java
# Make symbolic links to all TrueType font files installed in the system
@@ -364,7 +364,7 @@ find_rpm2cpio()
rpm2cpio_found="yes"
break
fi
- done
+ done
}
find_rpm()
@@ -375,7 +375,7 @@ find_rpm()
rpm_found="yes"
break
fi
- done
+ done
}
check_architecture()
@@ -383,9 +383,9 @@ check_architecture()
# Check, if system and installation set fit together (x86 and sparc).
# If not, throw a warning.
# Architecture of the installation set is saved in file "installdata/xpd/setup.xpd"
- # <architecture>sparc</architecture> or <architecture>i386</architecture>
+ # <architecture>sparc</architecture> or <architecture>i386</architecture>
# Architecture of system is determined with "uname -p"
-
+
setupxpdfile="installdata/xpd/setup.xpd"
if [ -f $setupxpdfile ]; then
@@ -396,9 +396,9 @@ check_architecture()
if [ -z "$match" ]; then
# architecture does not fit, warning required
if [ "$platform" = "sparc" ]; then
- echo "Warning: This is an attempt to install Solaris x86 packages on Solaris Sparc."
+ echo "Warning: This is an attempt to install Solaris x86 packages on Solaris Sparc."
else
- echo "Warning: This is an attempt to install Solaris Sparc packages on Solaris x86."
+ echo "Warning: This is an attempt to install Solaris Sparc packages on Solaris x86."
fi
fi
fi
@@ -413,7 +413,7 @@ find_jre_in_path()
java_runtime_found="yes"
break
fi
- done
+ done
}
check_jre_version()
@@ -483,15 +483,15 @@ while getopts hj: opt; do
java_runtime="${OPTARG}"
if [ ! -f "$java_runtime" ]; then
errortext="Error: Invalid java runtime $java_runtime, file does not exist."
- errorcode="2"
+ errorcode="2"
do_exit
- fi
+ fi
if [ ! -x "$java_runtime" ]; then
errortext="Error: Invalid java runtime $java_runtime, not an executable file."
- errorcode="3"
+ errorcode="3"
do_exit
- fi
- java_runtime_found="yes";
+ fi
+ java_runtime_found="yes";
;;
h) echo ${USAGE}
errortext=""
diff --git a/main/setup_native/scripts/langpackscript.sh b/main/setup_native/scripts/langpackscript.sh
index f824da3b5e..1a0dc7e3d7 100644
--- a/main/setup_native/scripts/langpackscript.sh
+++ b/main/setup_native/scripts/langpackscript.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
MYUID=`id | sed "s/(.*//g" | sed "s/.*=//"`
diff --git a/main/setup_native/scripts/linuxpatchscript.sh b/main/setup_native/scripts/linuxpatchscript.sh
index a0907bd2b1..0182df389f 100644
--- a/main/setup_native/scripts/linuxpatchscript.sh
+++ b/main/setup_native/scripts/linuxpatchscript.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,23 +8,23 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
MYUID=`id | sed "s/(.*//g" | sed "s/.*=//"`
if [ $MYUID -ne 0 ]
then
- echo You need to have super-user permissions to run this patch script
+ echo You need to have super-user permissions to run this patch script
exit 1
fi
@@ -77,7 +77,7 @@ if [ "x$KDERPM" != "x" ]; then
fi
echo
-rpm --upgrade -v --hash --prefix $PRODUCTINSTALLLOCATION --notriggers $RPMLIST
+rpm --upgrade -v --hash --prefix $PRODUCTINSTALLLOCATION --notriggers $RPMLIST
echo
# Some RPM versions have problems with -U and --prefix
diff --git a/main/setup_native/scripts/stclient_wrapper.sh b/main/setup_native/scripts/stclient_wrapper.sh
index 15692874ef..14226cd184 100644
--- a/main/setup_native/scripts/stclient_wrapper.sh
+++ b/main/setup_native/scripts/stclient_wrapper.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
if [ `uname -s` = "SunOS" ]; then
@@ -47,7 +47,7 @@ do
echo >&2 \
"usage: $0 -p <product name> -e <product version> -t <urn> -S <source> -P <parent product name> [-i <instance urn>]"
exit 1;;
- *) break;;
+ *) break;;
esac
shift
done
@@ -62,7 +62,7 @@ if [ ! -n $INSTANCE_URN ]; then
[ ${EXITCODE} -eq 0 -o ${EXITCODE} -eq 225 ] || exit 1
# early versions did not have a dedicated exitcode, so need to compare text output
- [ ${EXITCODE} -eq 225 -o "${TEST}" = "No records found" ] || echo "${TEST}"; exit 0
+ [ ${EXITCODE} -eq 225 -o "${TEST}" = "No records found" ] || echo "${TEST}"; exit 0
fi
uname=`uname -p`
diff --git a/main/setup_native/scripts/uninstall_linux.sh b/main/setup_native/scripts/uninstall_linux.sh
index 4211fda9c4..a1346b7066 100644
--- a/main/setup_native/scripts/uninstall_linux.sh
+++ b/main/setup_native/scripts/uninstall_linux.sh
@@ -1,6 +1,6 @@
#!/bin/bash
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
# Linux deinstallation
@@ -26,7 +26,7 @@
if [ $# -ne 1 ]
then
- echo
+ echo
echo "Usage:" $0 "<office-installation-dir>"
echo " <inst-destination-dir>: directory where the office to be removed is installed"
echo
diff --git a/main/setup_native/scripts/uninstall_solaris.sh b/main/setup_native/scripts/uninstall_solaris.sh
index 41a92dbe16..c25725f176 100644
--- a/main/setup_native/scripts/uninstall_solaris.sh
+++ b/main/setup_native/scripts/uninstall_solaris.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
# First parameter: Root path that will be removed
diff --git a/main/setup_native/scripts/unpack_update.sh b/main/setup_native/scripts/unpack_update.sh
index 098fc20414..a7ce0cf60a 100644
--- a/main/setup_native/scripts/unpack_update.sh
+++ b/main/setup_native/scripts/unpack_update.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
EXTENSION=`expr "//$1" : '.*\/.*\.\(t.*\)'`
diff --git a/main/setup_native/scripts/update.sh b/main/setup_native/scripts/update.sh
index 4877ce87d9..0da38d7047 100644
--- a/main/setup_native/scripts/update.sh
+++ b/main/setup_native/scripts/update.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
GNOMEXCMDS="/usr/bin/gksu"
@@ -50,17 +50,17 @@ make_tempfile() {
touch $TMPCMD
echo $TMPCMD
fi
-
+
}
-#
+#
# make_command_file - generate a command file to pass to xterm & co
#
run_in_terminal () {
TMPCMD=`make_tempfile 'Apache_OpenOffice-Online-Update'`
-
- cat >> $TMPCMD
+
+ cat >> $TMPCMD
cat >> $TMPCMD << \EOF
if [ $? -eq 0 -a ! -z "$DISPLAY" ]; then
@@ -79,7 +79,7 @@ EOF
}
#
-# run the command line passed as positional parameters either via
+# run the command line passed as positional parameters either via
# gksu/kdesu or via su command in a terminal emulator.
#
elevate() {
@@ -120,7 +120,7 @@ elevate() {
update_pkg() {
ADMINFILE=`make_tempfile 'Apache_OpenOffice-Online-Update-admin'`
-
+
cat >> $ADMINFILE << EOF
action=nocheck
conflict=nocheck
@@ -129,15 +129,15 @@ idepend=nocheck
rdepend=nocheck
mail=
EOF
-
+
PKGLIST=""
for i in `cd $1; ls -d *`; do
pkginfo -q $i && PKGLIST="$PKGLIST $i"
done
-
+
pkgrm -n -a $ADMINFILE $PKGLIST
pkgadd -n -a $ADMINFILE -d $1 $PKGLIST
-
+
rm -f $ADMINFILE
}
@@ -212,4 +212,4 @@ if [ "$CMD" = "update" ]; then
fi
else
Usage
-fi
+fi
diff --git a/main/shell/source/unix/exec/urltest.sh b/main/shell/source/unix/exec/urltest.sh
index 72c3fca546..fbe373d104 100644
--- a/main/shell/source/unix/exec/urltest.sh
+++ b/main/shell/source/unix/exec/urltest.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,15 +8,15 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
echo "$1"
diff --git a/main/shell/source/unix/misc/cde-open-url.sh b/main/shell/source/unix/misc/cde-open-url.sh
index 245d937038..f5b3943b4e 100755
--- a/main/shell/source/unix/misc/cde-open-url.sh
+++ b/main/shell/source/unix/misc/cde-open-url.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
if [ -x /usr/bin/mktemp ]
diff --git a/main/shell/source/unix/misc/gnome-open-url.sh b/main/shell/source/unix/misc/gnome-open-url.sh
index 06f3b92b93..13a5845a49 100644
--- a/main/shell/source/unix/misc/gnome-open-url.sh
+++ b/main/shell/source/unix/misc/gnome-open-url.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
# use xdg-open or gnome-open if available
diff --git a/main/shell/source/unix/misc/kde-open-url.sh b/main/shell/source/unix/misc/kde-open-url.sh
index 184fd23b9e..6cb187a8d5 100755
--- a/main/shell/source/unix/misc/kde-open-url.sh
+++ b/main/shell/source/unix/misc/kde-open-url.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
# special handling for mailto: uris
diff --git a/main/shell/source/unix/misc/open-url.sh b/main/shell/source/unix/misc/open-url.sh
index 1ce116a55f..277b17b2e6 100755
--- a/main/shell/source/unix/misc/open-url.sh
+++ b/main/shell/source/unix/misc/open-url.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,19 +8,19 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
-# tries to locate the executable specified
+# tries to locate the executable specified
# as first parameter in the user's path.
which() {
if [ ! -z "$1" ]; then
@@ -33,7 +33,7 @@ which() {
fi
}
-# checks for the original mozilla start script(s)
+# checks for the original mozilla start script(s)
# and restrict the "-remote" semantics to those.
run_mozilla() {
if file "$1" | grep "script" > /dev/null && grep "NPL" "$1" > /dev/null; then
@@ -48,7 +48,7 @@ run_mozilla() {
fi
}
-# checks the browser value for a %s as defined in
+# checks the browser value for a %s as defined in
# http://www.catb.org/~esr/BROWSER/index.html
run_browser() {
echo "$1|$2" | awk '
diff --git a/main/slideshow/qa/debug/colors.sh b/main/slideshow/qa/debug/colors.sh
index 56569f184b..9722169228 100644
--- a/main/slideshow/qa/debug/colors.sh
+++ b/main/slideshow/qa/debug/colors.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
#
# Output a PS file with a legend for the node state colors
diff --git a/main/slideshow/qa/debug/nodetree.sh b/main/slideshow/qa/debug/nodetree.sh
index 306e9ca7c3..c9555d0ccd 100644
--- a/main/slideshow/qa/debug/nodetree.sh
+++ b/main/slideshow/qa/debug/nodetree.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
#
# $Revision: 1.3 $
@@ -32,20 +32,20 @@
# First of all, you need to recompile modules slideshow and canvas
# with VERBOSE=t set in the environment, and debug=t defined at the
# build tool command line. Then run your slideshow and redirect stdout
-# to a file.
+# to a file.
#
# Then, call 'nodetree.sh trace-file > tree.ps' to generate a
# PostScript file for the AnimationNode tree generated during the show.
-# Since these easily get pretty huge, use only one page, and try to
-# limit the slide content (which have effects assigned, that is) to
+# Since these easily get pretty huge, use only one page, and try to
+# limit the slide content (which have effects assigned, that is) to
# the bare minimum (to reproduce your bug, or whatever you need this
# for).
#
-# The generated output will have all nodes color-coded with their state
-# at the point when the tree was dumped (see colors.sh for the color
+# The generated output will have all nodes color-coded with their state
+# at the point when the tree was dumped (see colors.sh for the color
# codes)
#
-# When looking for the mechanics that generate the relevant output,
+# When looking for the mechanics that generate the relevant output,
# grep for the DEBUG_NODES_SHOWTREE macros in the slideshow source:
# Each such place dumps the current node tree to the trace output. Thus,
# if you need to check the tree state at other places or times, just add
diff --git a/main/solenv/bin/addsym-macosx.sh b/main/solenv/bin/addsym-macosx.sh
index 2d120ad114..a0b2ed6601 100755
--- a/main/solenv/bin/addsym-macosx.sh
+++ b/main/solenv/bin/addsym-macosx.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
# This script is needed in the process of generating exported
diff --git a/main/solenv/bin/addsym-mingw.sh b/main/solenv/bin/addsym-mingw.sh
index 48b32ee08d..7ecc7027aa 100644
--- a/main/solenv/bin/addsym-mingw.sh
+++ b/main/solenv/bin/addsym-mingw.sh
@@ -1,6 +1,6 @@
#!/bin/bash
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
# This script is needed in the process of generating exported
@@ -38,7 +38,7 @@
# of line was also replaced by |
if [ -s $1 ]
-then
+then
cat $1 | sed 's#*#.*#g
s#?#.#g
s#;.*##g
diff --git a/main/solenv/bin/checkdll.sh b/main/solenv/bin/checkdll.sh
index 438440969a..1a3952f54b 100755
--- a/main/solenv/bin/checkdll.sh
+++ b/main/solenv/bin/checkdll.sh
@@ -1,6 +1,6 @@
#! /bin/sh
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
# checkdll.sh - execute checkdll with all -L arguments to this script
# prepended to LD_LIBRARY_PATH
diff --git a/main/solenv/bin/soirpm.sh b/main/solenv/bin/soirpm.sh
index d9028685dd..cae5e66af8 100755
--- a/main/solenv/bin/soirpm.sh
+++ b/main/solenv/bin/soirpm.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
LIBRPMBUILD=$(find ${COMPATH} -name 'librpmbuild-4.1*' -print)
diff --git a/main/source_soenv.sh b/main/source_soenv.sh
index 3e40972e53..9d522c359f 100644
--- a/main/source_soenv.sh
+++ b/main/source_soenv.sh
@@ -1,6 +1,6 @@
#!/bin/sh
###############################################################
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
###############################################################
# if no environment is set, try to find one, and source it
diff --git a/main/sysui/desktop/share/create_tree.sh b/main/sysui/desktop/share/create_tree.sh
index 0c4a715673..a858701814 100644
--- a/main/sysui/desktop/share/create_tree.sh
+++ b/main/sysui/desktop/share/create_tree.sh
@@ -1,5 +1,5 @@
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,16 +7,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
umask 022
diff --git a/main/sysui/desktop/share/openoffice.sh b/main/sysui/desktop/share/openoffice.sh
index f20cd643fe..7f4508b9b4 100644
--- a/main/sysui/desktop/share/openoffice.sh
+++ b/main/sysui/desktop/share/openoffice.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,15 +8,15 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
exec /opt/%PREFIX/program/soffice "$@"
diff --git a/main/sysui/desktop/share/printeradmin.sh b/main/sysui/desktop/share/printeradmin.sh
index 6c5de71ed3..4b0fac8875 100644
--- a/main/sysui/desktop/share/printeradmin.sh
+++ b/main/sysui/desktop/share/printeradmin.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
-exec /opt/%PREFIX/program/spadmin
+exec /opt/%PREFIX/program/spadmin
diff --git a/main/toolkit/src2xml/dryrunall.sh b/main/toolkit/src2xml/dryrunall.sh
index a681f6de1a..878190ce8e 100644
--- a/main/toolkit/src2xml/dryrunall.sh
+++ b/main/toolkit/src2xml/dryrunall.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,15 +8,15 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
source/src2xml.py --dry-run --includes-from=include.lst $(cat src.lst) "$@"
diff --git a/main/toolkit/src2xml/sc.sh b/main/toolkit/src2xml/sc.sh
index eac9056c5d..445539d0f0 100644
--- a/main/toolkit/src2xml/sc.sh
+++ b/main/toolkit/src2xml/sc.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
source/src2xml.py --include-path=$(tr '\n' ':' < include-sc.lst) --dry-run $(cat src-sc.lst) "$@"
diff --git a/main/toolkit/src2xml/sd.sh b/main/toolkit/src2xml/sd.sh
index 34a8bf86a4..85b4a0f457 100644
--- a/main/toolkit/src2xml/sd.sh
+++ b/main/toolkit/src2xml/sd.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
source/src2xml.py --include-path=$(tr '\n' ':' < include-sd.lst) --dry-run $(cat src-sd.lst) "$@"
diff --git a/main/toolkit/src2xml/sw.sh b/main/toolkit/src2xml/sw.sh
index 047f7d3bc5..2421a1be17 100644
--- a/main/toolkit/src2xml/sw.sh
+++ b/main/toolkit/src2xml/sw.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
source/src2xml.py --include-path=$(tr '\n' ':' < include-sw.lst) --dry-run $(cat src-sw.lst) "$@"
diff --git a/main/toolkit/workben/layout/un-test.sh b/main/toolkit/workben/layout/un-test.sh
index b7f1d56044..78519c9ebc 100644
--- a/main/toolkit/workben/layout/un-test.sh
+++ b/main/toolkit/workben/layout/un-test.sh
@@ -1,6 +1,6 @@
#! /bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
# un-test.sh: remove TEST_LAYOUT code from OO.o implementation
diff --git a/main/ure/source/startup.sh b/main/ure/source/startup.sh
index 73b5622d96..013a05d0dc 100644
--- a/main/ure/source/startup.sh
+++ b/main/ure/source/startup.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
# Pass -env arguments on to javaldx; needs to be fixed:
diff --git a/main/writerfilter/source/ooxml/efforts.sh b/main/writerfilter/source/ooxml/efforts.sh
index a2f00b6ccf..dd35466e74 100644
--- a/main/writerfilter/source/ooxml/efforts.sh
+++ b/main/writerfilter/source/ooxml/efforts.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
./status.sh | xmllint --format - | xsltproc todo.xsl - | xsltproc effort.xsl -
diff --git a/main/writerfilter/source/ooxml/stage1.sh b/main/writerfilter/source/ooxml/stage1.sh
index ead955452e..98f0fe6883 100755
--- a/main/writerfilter/source/ooxml/stage1.sh
+++ b/main/writerfilter/source/ooxml/stage1.sh
@@ -1,5 +1,5 @@
###############################################################
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,16 +7,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
###############################################################
#!/bin/bash
@@ -28,7 +28,7 @@ echo "<stage1>"
cat $1 | tail -n +2
-find $SEARCHIN -name "*.cxx" -exec grep -nH -A 1 "case NS_" {} \; |
+find $SEARCHIN -name "*.cxx" -exec grep -nH -A 1 "case NS_" {} \; |
grep -v "//.*case NS_" |
sed 's#'$SEARCHIN'##' |
sed 's#\(^[^:]*\):\([0-9]*\):#<qname file="\1" line="\2"#' |
(openoffice) 01/02: poll.pl: use lowercase HTML tags (#276)
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit dcee7c1d1ce4512b087fc67e98dd58b85cb8fc37
Author: John Bampton <jb...@users.noreply.github.com>
AuthorDate: Thu Feb 13 03:34:46 2025 +1000
poll.pl: use lowercase HTML tags (#276)
(cherry picked from commit 95845cf7eb05a00e51586b67f45bded6fbfd46d6)
---
main/sd/res/webview/poll.pl | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/main/sd/res/webview/poll.pl b/main/sd/res/webview/poll.pl
index fe24f1a865..a5b7110ab3 100755
--- a/main/sd/res/webview/poll.pl
+++ b/main/sd/res/webview/poll.pl
@@ -23,7 +23,7 @@
require "common.pl";
print "Content-type: text/html\n\n";
-print "<HTML>";
+print "<html>";
# get current and last shown picture id
$sCurrPic = join( "", common::File_read( "currpic.txt" ) );
@@ -31,22 +31,22 @@ $sCurrPic = join( "", common::File_read( "currpic.txt" ) );
%aRequestMap = common::HTTP_getRequest();
$sLastPic = $aRequestMap{ "LastPic" };
-print "<HEAD>";
- print "<META http-equiv=\"refresh\" CONTENT=\"" . $common::REFRESH_TIME . "; URL=poll.pl?LastPic=" . $sCurrPic . "\">";
-print "</HEAD>";
+print "<head>";
+ print "<meta http-equiv=\"refresh\" content=\"" . $common::REFRESH_TIME . "; URL=poll.pl?LastPic=" . $sCurrPic . "\">";
+print "</head>";
#' a new picture was chosen ?
if( $sLastPic ne $sCurrPic )
{
# then show the new picture
- print "<BODY bgcolor=\"red\" onLoad=\"parent.frame1.location.href='./show.pl?" . $sCurrPic . "'\">";
+ print "<body bgcolor=\"red\" onLoad=\"parent.frame1.location.href='./show.pl?" . $sCurrPic . "'\">";
}
else
{
# otherwise do nothing
- print "<BODY bgcolor=\"green\">";
+ print "<body bgcolor=\"green\">";
}
-print "</BODY>";
+print "</body>";
-print "</HTML>";
+print "</html>";