diff options
Diffstat (limited to 'setup_native/scripts')
-rw-r--r-- | setup_native/scripts/admin.pl | 8 | ||||
-rw-r--r-- | setup_native/scripts/javaloader.sh | 4 | ||||
-rw-r--r-- | setup_native/scripts/makefile.mk | 6 | ||||
-rw-r--r-- | setup_native/scripts/register_extensions | 2 | ||||
-rw-r--r-- | setup_native/scripts/source/makefile.mk | 6 | ||||
-rw-r--r-- | setup_native/scripts/stclient_wrapper.sh | 2 | ||||
-rw-r--r-- | setup_native/scripts/userland.txt | 6 |
7 files changed, 9 insertions, 25 deletions
diff --git a/setup_native/scripts/admin.pl b/setup_native/scripts/admin.pl index bb2f8b3a7d91..89588d0c4d03 100644 --- a/setup_native/scripts/admin.pl +++ b/setup_native/scripts/admin.pl @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: admin.pl,v $ -# -# $Revision: 1.1.2.2 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -1064,7 +1060,7 @@ sub register_one_extension $executable = "./" . $executable; } - my $systemcall = $executable . " add --shared --verbose " . "\"" . $localextension . "\"" . " -env:UserInstallation=file://" . $temppath . " 2\>\&1 |"; + my $systemcall = $executable . " add --shared --verbose --suppress-license " . "\"" . $localextension . "\"" . " -env:UserInstallation=file://" . $temppath . " 2\>\&1 |"; print "... $systemcall\n"; diff --git a/setup_native/scripts/javaloader.sh b/setup_native/scripts/javaloader.sh index 22b1eb927625..e23505f586b0 100644 --- a/setup_native/scripts/javaloader.sh +++ b/setup_native/scripts/javaloader.sh @@ -242,7 +242,7 @@ install_linux_rpm() # start to install jre echo "Extracting ..." olddir=`pwd` - cd $tempdir + cd "$tempdir" rpm2cpio $tempjrefile | cpio -i --make-directories rm -f $tempjrefile # we do not need it anymore, so conserve discspace @@ -330,7 +330,7 @@ install_linux_rpm() fi echo "Done." - cd $olddir + cd "$olddir" } find_rpm2cpio() diff --git a/setup_native/scripts/makefile.mk b/setup_native/scripts/makefile.mk index 59b310fe0e70..b8fc6649eddf 100644 --- a/setup_native/scripts/makefile.mk +++ b/setup_native/scripts/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.18.112.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/setup_native/scripts/register_extensions b/setup_native/scripts/register_extensions index c7fa2815b441..034642175c29 100644 --- a/setup_native/scripts/register_extensions +++ b/setup_native/scripts/register_extensions @@ -68,7 +68,7 @@ done echo for i in $FILELIST; do - COMMAND="$UNOPKG add --shared $i" + COMMAND="$UNOPKG add --shared --suppress-license $i" echo $COMMAND $COMMAND done diff --git a/setup_native/scripts/source/makefile.mk b/setup_native/scripts/source/makefile.mk index 6ff2dfe0afe6..6933f53d6149 100644 --- a/setup_native/scripts/source/makefile.mk +++ b/setup_native/scripts/source/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.12 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/setup_native/scripts/stclient_wrapper.sh b/setup_native/scripts/stclient_wrapper.sh index 223b8a35f6d8..52ff8abcb0ee 100644 --- a/setup_native/scripts/stclient_wrapper.sh +++ b/setup_native/scripts/stclient_wrapper.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2007 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # All rights reserved. # diff --git a/setup_native/scripts/userland.txt b/setup_native/scripts/userland.txt index 7c7ef86f45a3..9983ab46fe16 100644 --- a/setup_native/scripts/userland.txt +++ b/setup_native/scripts/userland.txt @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: userland.txt,v $ -# -# $Revision: 1.2 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify |