[Libreoffice-commits] core.git: setup_native/scripts

[Patrick Luby (via logerrit)]

 setup_native/scripts/osx_install_languagepack.applescript |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1184a0130e7f340093a4bc0de032ebea1866b467
Author: Patrick Luby 
AuthorDate: Fri Jul 21 08:51:02 2023 -0400
Commit: Patrick Luby 
CommitDate: Wed Jul 26 14:40:02 2023 +0200

tdf#144053 Compare version to ProductKey entry in bootstraprc

Using the mdls command fails if macOS Spotlight is disabled for the path
selected by the user. So, instead, check if the path contains a matching
"ProductKey=" line in its Contents/Resources/bootstraprc file.

Change-Id: Idbf8e2712b9fae8efa0997cf5c5c0f3fa6e68658
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154718
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Reviewed-by: Patrick Luby 

diff --git a/setup_native/scripts/osx_install_languagepack.applescript 
b/setup_native/scripts/osx_install_languagepack.applescript
index 4083b01cd97c..270082396125 100644
--- a/setup_native/scripts/osx_install_languagepack.applescript
+++ b/setup_native/scripts/osx_install_languagepack.applescript
@@ -126,9 +126,9 @@ end if
 
 -- now only check whether the path is really from [PRODUCTNAME]
 try
-   do shell script "mdls --raw --name kMDItemFSName --name kMDItemVersion 
" & quoted form of (choice as string) & " | xargs -0 | fgrep '[PRODUCTNAME].app 
[PRODUCTVERSION]'"
+   do shell script "grep '^ProductKey=[PRODUCTNAME] [PRODUCTVERSION]$' " & 
quoted form of (choice as string) & "/Contents/Resources/bootstraprc"
 on error
-   display dialog (choice as string) & appInvalid buttons {InstallLabel} 
default button 1 with icon 0
+   display dialog (choice as string) & " " & appInvalid buttons {OKLabel} 
default button 1 with icon 0
return 3 --wrong target-directory
 end try
 

[Libreoffice-commits] core.git: setup_native/scripts

[Caolán McNamara (via logerrit)]

 setup_native/scripts/install_linux.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 241641afe92fe525e45eb3b6d30f1a0f737d825c
Author: Caolán McNamara 
AuthorDate: Thu Jan 27 17:39:31 2022 +
Commit: Caolán McNamara 
CommitDate: Sat Jan 29 11:42:27 2022 +0100

use mktemp for FAKEDBRPM

Change-Id: I53d0f027b60d681e16298531e3d890fafc43aea6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129062
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/setup_native/scripts/install_linux.sh 
b/setup_native/scripts/install_linux.sh
index 9540a505e974..abf9b2d84e58 100644
--- a/setup_native/scripts/install_linux.sh
+++ b/setup_native/scripts/install_linux.sh
@@ -241,7 +241,7 @@ else
 fi
 
 # populate the private rpm database with the dependencies needed
-FAKEDBRPM=/tmp/fake-db-1.0-$$.noarch.rpm
+FAKEDBRPM=`mktemp -p /tmp fake-db-1.0-XX.noarch.rpm`
 linenum=???
 tail -n +$linenum $0 > $FAKEDBRPM
 

[Libreoffice-commits] core.git: setup_native/scripts

[Caolán McNamara (via logerrit)]

 setup_native/scripts/langpackscript.sh |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit e3efba0f8187251cef8cb29c00a7eee5930ec70f
Author: Caolán McNamara 
AuthorDate: Thu Jan 27 20:27:19 2022 +
Commit: Caolán McNamara 
CommitDate: Fri Jan 28 09:50:44 2022 +0100

use mktemp for outdir

Change-Id: I2aa04ab31c0966167dee47b1c0ea6d2228e262da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129065
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/setup_native/scripts/langpackscript.sh 
b/setup_native/scripts/langpackscript.sh
index 4f0dd548467b..1a6bb39a3d48 100644
--- a/setup_native/scripts/langpackscript.sh
+++ b/setup_native/scripts/langpackscript.sh
@@ -108,8 +108,7 @@ esac
 
 # Unpacking
 
-outdir=/var/tmp/install_$$
-mkdir $outdir
+outdir=`mktemp -d -p /var/tmp`
 
 #diskSpace=`df -k $outdir | $tail_prog -1 | awk '{if ( $4 ~ /%/) { print $3 } 
else { print $4 } }'`
 #if [ $diskSpace -lt $diskSpaceRequired ]; then

[Libreoffice-commits] core.git: setup_native/scripts

[Christian Lohmaier (via logerrit)]

 setup_native/scripts/osx_install_languagepack.applescript |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit daa162c20f4c7d61edc217ed44cb2854652a63ec
Author: Christian Lohmaier 
AuthorDate: Fri Mar 12 12:25:30 2021 +0100
Commit: Christian Lohmaier 
CommitDate: Tue Mar 16 15:58:28 2021 +0100

tdf#134607 use kMDItemFSName instead of _kMDItemDisplayNameWithExtensions

apparently the latter is not available on older versions of macOS.
https://developer.apple.com/documentation/coreservices/kmditemfsname
lists it as in version 10.4 and not flagged as deprecated, so keeping
fingers crossed that it is not affected by user-settings or similar…

Change-Id: I208d22f2abd628e7d95babc23ddb145a88bcf5cc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112385
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/setup_native/scripts/osx_install_languagepack.applescript 
b/setup_native/scripts/osx_install_languagepack.applescript
index bc793a510c8d..4083b01cd97c 100644
--- a/setup_native/scripts/osx_install_languagepack.applescript
+++ b/setup_native/scripts/osx_install_languagepack.applescript
@@ -66,7 +66,7 @@ end if
 set found_ooos_all to ""
 -- command might return an error if spotlight is disabled completely
 try
-   set found_ooos_all to (do shell script "mdfind \"kMDItemContentType == 
'com.apple.application-bundle' && _kMDItemDisplayNameWithExtensions == 
'[PRODUCTNAME].app'\"")
+   set found_ooos_all to (do shell script "mdfind \"kMDItemContentType == 
'com.apple.application-bundle' && kMDItemFSName == '[PRODUCTNAME].app'\"")
 end try
 set found_ooos_all to found_ooos_all & "
 " & chooseMyOwn
@@ -126,7 +126,7 @@ end if
 
 -- now only check whether the path is really from [PRODUCTNAME]
 try
-   do shell script "mdls --raw --name _kMDItemDisplayNameWithExtensions 
--name kMDItemVersion " & quoted form of (choice as string) & " | xargs -0 | 
fgrep '[PRODUCTNAME].app [PRODUCTVERSION]'"
+   do shell script "mdls --raw --name kMDItemFSName --name kMDItemVersion 
" & quoted form of (choice as string) & " | xargs -0 | fgrep '[PRODUCTNAME].app 
[PRODUCTVERSION]'"
 on error
display dialog (choice as string) & appInvalid buttons {InstallLabel} 
default button 1 with icon 0
return 3 --wrong target-directory
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: setup_native/scripts

[Christian Lohmaier (via logerrit)]

 setup_native/scripts/osx_install_languagepack.applescript |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dbaf1d75601cb911d1c17e1e63d2c7047f2cf9e1
Author: Christian Lohmaier 
AuthorDate: Fri Feb 5 15:22:19 2021 +0100
Commit: Christian Lohmaier 
CommitDate: Fri Feb 5 15:30:26 2021 +0100

tdf#134607 mac-langpacks: always query for full name with extension

kMDItemDisplayName has different values depending on the setting whether
to show extensions for all filetypes in Finder, breaking the
detection/validation of the installation target in case the user doesn't
use the default setting.

Change-Id: Ic9605abaaa1f070f1f5ec9940190fd1dd2555bdf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110479
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

diff --git a/setup_native/scripts/osx_install_languagepack.applescript 
b/setup_native/scripts/osx_install_languagepack.applescript
index 8ad55396766a..bc793a510c8d 100644
--- a/setup_native/scripts/osx_install_languagepack.applescript
+++ b/setup_native/scripts/osx_install_languagepack.applescript
@@ -66,7 +66,7 @@ end if
 set found_ooos_all to ""
 -- command might return an error if spotlight is disabled completely
 try
-   set found_ooos_all to (do shell script "mdfind \"kMDItemContentType == 
'com.apple.application-bundle' && kMDItemDisplayName == '[PRODUCTNAME]'\"")
+   set found_ooos_all to (do shell script "mdfind \"kMDItemContentType == 
'com.apple.application-bundle' && _kMDItemDisplayNameWithExtensions == 
'[PRODUCTNAME].app'\"")
 end try
 set found_ooos_all to found_ooos_all & "
 " & chooseMyOwn
@@ -126,7 +126,7 @@ end if
 
 -- now only check whether the path is really from [PRODUCTNAME]
 try
-   do shell script "mdls --raw --name kMDItemDisplayName --name 
kMDItemVersion " & quoted form of (choice as string) & " | xargs -0 | fgrep 
'[PRODUCTNAME] [PRODUCTVERSION]'"
+   do shell script "mdls --raw --name _kMDItemDisplayNameWithExtensions 
--name kMDItemVersion " & quoted form of (choice as string) & " | xargs -0 | 
fgrep '[PRODUCTNAME].app [PRODUCTVERSION]'"
 on error
display dialog (choice as string) & appInvalid buttons {InstallLabel} 
default button 1 with icon 0
return 3 --wrong target-directory
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: setup_native/scripts

[Christian Lohmaier (via logerrit)]

 setup_native/scripts/osx_install_languagepack.applescript |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 20c17b0ffb89102d086f80303887a8594f0c3c8c
Author: Christian Lohmaier 
AuthorDate: Tue Jun 16 11:40:16 2020 +0200
Commit: Christian Lohmaier 
CommitDate: Tue Jun 16 16:45:53 2020 +0200

macOS fix langpack installer with manually selected .app directory

For cases when there are multiple matching apps where the Languagepack
might be installed to, the "make sure to launch LO once before
installing the langpack" mechanism can fail.
Even if it is the call "tell application  to activate" that
fails, the error handler assumes that the untar operation didn't work
and suggests to retry with admin privileges, modifying the .app bundle
before having it started once (AKA verified by gatekeeper), breaking
the app.
Passing the full path to the application object should fix that.

Change-Id: I47d61ad68e225fbdba191702ba85598164602e81
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96449
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/setup_native/scripts/osx_install_languagepack.applescript 
b/setup_native/scripts/osx_install_languagepack.applescript
index 107029421d1d..8ad55396766a 100644
--- a/setup_native/scripts/osx_install_languagepack.applescript
+++ b/setup_native/scripts/osx_install_languagepack.applescript
@@ -146,10 +146,11 @@ try
(* A start of unchanged LO must take place so Gatekeeper will verify
   the signature prior to installing the languagepack
*)
-   if application choice is not running then
+   set apppath to POSIX path of choice
+   if application apppath is not running then
-- this will flash the startcenter once...
-   tell application choice to activate
-   tell application choice to quit
+   tell application apppath to activate
+   tell application apppath to quit
end if
do shell script tarCommand

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: setup_native/scripts

[Christian Lohmaier (via logerrit)]

 setup_native/scripts/osx_install_languagepack.applescript |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9da104538dd92861b2b9e4e95ccbafe12632fe83
Author: Christian Lohmaier 
AuthorDate: Tue Jun 16 11:14:14 2020 +0200
Commit: Christian Lohmaier 
CommitDate: Tue Jun 16 13:56:03 2020 +0200

mac langpack script: simplify mdfind call to not use wildcard match

I think this is leftover from very early development stages when it
didn't have placeholders, but literal OpenOffice or similar at the time.

Not matching for wildcard but for full LibreOffice/LibreOfficeDev string
makes removing the languagepacks from the match superfluous

It was wrong anyway, since kMDItemDisplayName has the name without the
.app extension (you'd have to use _kMDItemDisplayNameWithExtensions for
that)

Change-Id: I37b1ed2d23ea18fd81a8844f35c9cb0d5dc34211
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96441
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/setup_native/scripts/osx_install_languagepack.applescript 
b/setup_native/scripts/osx_install_languagepack.applescript
index 495baceb4f31..107029421d1d 100644
--- a/setup_native/scripts/osx_install_languagepack.applescript
+++ b/setup_native/scripts/osx_install_languagepack.applescript
@@ -66,7 +66,7 @@ end if
 set found_ooos_all to ""
 -- command might return an error if spotlight is disabled completely
 try
-   set found_ooos_all to (do shell script "mdfind \"kMDItemContentType == 
'com.apple.application-bundle' && kMDItemDisplayName == '[PRODUCTNAME]*' && 
kMDItemDisplayName != '[FULLAPPPRODUCTNAME].app'\"")
+   set found_ooos_all to (do shell script "mdfind \"kMDItemContentType == 
'com.apple.application-bundle' && kMDItemDisplayName == '[PRODUCTNAME]'\"")
 end try
 set found_ooos_all to found_ooos_all & "
 " & chooseMyOwn
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: setup_native/scripts

[Christian Lohmaier (via logerrit)]

 setup_native/scripts/osx_install_languagepack.applescript |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7708b3f2d62f3defae261cd2d3621ae3b324d9d1
Author: Christian Lohmaier 
AuthorDate: Tue Jun 16 11:02:39 2020 +0200
Commit: Christian Lohmaier 
CommitDate: Tue Jun 16 12:47:06 2020 +0200

tdf#133511 adjust langpack script for removal of CFBundleGetInfoString

3a028418190790c3bbaf6e505ff55b7bb8c0b474 removed the string from
Info.plist, but the languagepack install script tried to use that to
make sure whatever the user selects/is found is from the dame type (dev
vs release and codeline/version). Instead of doing multiple
greps/multiline ones (there are multiple version strings in that file,
only one being from LO itself…) use mdls instead to pick the interesting
properties to build a "PRODUCTNAME FULLVERSION" string again we can
match against. --raw switch is nul separated, so add additional xargs -0
in there instead of trying to match a nul with grep
(without --raw it is a nice human readable multiline string)

Change-Id: I049a8425709a0c41b61aa09452490b481d39e4d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96439
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/setup_native/scripts/osx_install_languagepack.applescript 
b/setup_native/scripts/osx_install_languagepack.applescript
index f5cd0dc6ac8f..495baceb4f31 100644
--- a/setup_native/scripts/osx_install_languagepack.applescript
+++ b/setup_native/scripts/osx_install_languagepack.applescript
@@ -126,7 +126,7 @@ end if
 
 -- now only check whether the path is really from [PRODUCTNAME]
 try
-   do shell script "grep '[PRODUCTNAME] [PRODUCTVERSION]'   " & 
quoted form of (choice as string) & "/Contents/Info.plist"
+   do shell script "mdls --raw --name kMDItemDisplayName --name 
kMDItemVersion " & quoted form of (choice as string) & " | xargs -0 | fgrep 
'[PRODUCTNAME] [PRODUCTVERSION]'"
 on error
display dialog (choice as string) & appInvalid buttons {InstallLabel} 
default button 1 with icon 0
return 3 --wrong target-directory
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: setup_native/scripts solenv/bin

[Johnny_M (via logerrit)]

 setup_native/scripts/admin.pl  |4 ++--
 solenv/bin/modules/installer/parameter.pm  |4 ++--
 solenv/bin/modules/par2script/parameter.pm |4 ++--
 solenv/bin/modules/pre2par/parameter.pm|4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit f2c0e54bccf0f2b9b0da34be2a91d863b4e76eae
Author: Johnny_M 
AuthorDate: Fri Apr 10 11:41:02 2020 +0200
Commit: Michael Weghorn 
CommitDate: Mon Apr 20 09:19:05 2020 +0200

Translate German variable names

Ende -> End

Change-Id: I2d63ddfeb1fa59ed1b0e3bbf2d39d5221cd5425f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92026
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/setup_native/scripts/admin.pl b/setup_native/scripts/admin.pl
index edc41cdfa207..714da400c4a9 100644
--- a/setup_native/scripts/admin.pl
+++ b/setup_native/scripts/admin.pl
@@ -56,7 +56,7 @@ BEGIN
 
 sub usage
 {
-print 

[Libreoffice-commits] core.git: setup_native/scripts vcl/qt5

[Libreoffice Gerrit user]

 setup_native/scripts/langpackscript.sh |4 ++--
 vcl/qt5/Qt5Widget.cxx  |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit da9bb5165152bfa00425c08cf46d6a3775da0a1b
Author: Andrea Gelmini 
AuthorDate: Thu Jul 19 16:22:39 2018 +0200
Commit: Julien Nabet 
CommitDate: Thu Jul 19 18:54:50 2018 +0200

Fix typos

Change-Id: Id31aa22a98f7520a37e624cbb1dc4d949246c0fb
Reviewed-on: https://gerrit.libreoffice.org/57622
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/setup_native/scripts/langpackscript.sh 
b/setup_native/scripts/langpackscript.sh
index 186390c19c05..4f0dd548467b 100644
--- a/setup_native/scripts/langpackscript.sh
+++ b/setup_native/scripts/langpackscript.sh
@@ -113,8 +113,8 @@ mkdir $outdir
 
 #diskSpace=`df -k $outdir | $tail_prog -1 | awk '{if ( $4 ~ /%/) { print $3 } 
else { print $4 } }'`
 #if [ $diskSpace -lt $diskSpaceRequired ]; then
-#printf "You will need atleast %s kBytes of Disk Free\n" $diskSpaceRequired
-#printf "Please free up the required Disk Space and try again\n"
+#printf "You will need at least %s kBytes of free disk space\n" 
$diskSpaceRequired
+#printf "Please free up the required disk space and try again\n"
 #exit 3
 #fi
 
diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index 8f96bc876322..75f95b40310e 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -208,7 +208,7 @@ void VclQtMixinBase::mixinCloseEvent(QCloseEvent* pEvent)
 pEvent->accept();
 // SalEvent::Close returning false may mean that user has vetoed
 // closing the frame ("you have unsaved changes" dialog for example)
-// We should't process the event in such case
+// We shouldn't process the event in such case
 else
 pEvent->ignore();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: setup_native/scripts

[Troy]

 setup_native/scripts/source/getuid.c |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit c113d386888152632ae26fae9f59faf4f1d2f2dc
Author: Troy 
Date:   Tue Jun 13 16:40:47 2017 +1000

Add setgid call stub for Linux

Required by dpkg --build on Debian squeeze.

Change-Id: I5e0e9c8f7851555a277d21aa14f9d695bad12198
Reviewed-on: https://gerrit.libreoffice.org/38765
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/setup_native/scripts/source/getuid.c 
b/setup_native/scripts/source/getuid.c
index 8d0d9ebc1627..3f86817051de 100644
--- a/setup_native/scripts/source/getuid.c
+++ b/setup_native/scripts/source/getuid.c
@@ -24,6 +24,8 @@
 #include 
 #include 
 
+#define UNUSED(x) (void)(x)
+
 #ifdef _cplusplus
 extern "C" {
 #endif
@@ -112,6 +114,7 @@ int fstatat64(int fildes, const char *path, struct stat64  
*buf, int flag)
 
 uid_t getuid  (void) {return 0;}
 uid_t geteuid (void) {return 0;}
+int setgid  (gid_t p) { UNUSED(p); return 0; }
 
 /* This is to fool tar */
 #ifdef X86_64
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: setup_native/scripts

[Yeliz Taneroğlu]

 setup_native/scripts/unpack_update.sh |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 46a30d5eb89a7198f30a895ac92ab5d70d111511
Author: Yeliz Taneroğlu 
Date:   Tue May 16 15:11:06 2017 +0300

tdf#105204 fix shellcheck warning in setup_native/scripts/unpack_update.sh

Change-Id: Ic2a3b58dac3bc148cf9a2bd8237574d4851aabe6
SC2006: Use $(STATEMENT) instead of legacy `STATEMENT`
SC2035: Use ./*glob* or -- *glob* so names with dashes won't become options.
Reviewed-on: https://gerrit.libreoffice.org/37681
Reviewed-by: Chris Sherlock 
Tested-by: Chris Sherlock 

diff --git a/setup_native/scripts/unpack_update.sh 
b/setup_native/scripts/unpack_update.sh
index 1b7b53430503..1af4865cd308 100644
--- a/setup_native/scripts/unpack_update.sh
+++ b/setup_native/scripts/unpack_update.sh
@@ -27,7 +27,7 @@ NUM=1
 DESTPATH="$BASEDIR/$FOLDER"
 
 while [ -d "$DESTPATH" ]; do
-  NUM=`expr $NUM + 1`
+  NUM=$(expr $NUM + 1)
   DESTPATH="$BASEDIR/$FOLDER-$NUM"
 done
 
@@ -47,4 +47,4 @@ else
   exit 2
 fi
 
-UPDATE=`eval ls */update` && SUBFOLDER=`dirname $UPDATE` && mv $SUBFOLDER/* . 
&& rmdir $SUBFOLDER && echo "$DESTPATH/update"
+UPDATE=$(eval ls ./*/update) && SUBFOLDER=$(dirname $UPDATE) && mv 
$SUBFOLDER/* . && rmdir $SUBFOLDER && echo "$DESTPATH/update"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: setup_native/scripts setup_native/source solenv/bin

[Christian Lohmaier]

 setup_native/scripts/osx_install_languagepack.applescript |8 ++
 setup_native/source/mac/Info.plist.langpack   |2 -
 solenv/bin/modules/installer/simplepackage.pm |   18 ++
 3 files changed, 22 insertions(+), 6 deletions(-)

New commits:
commit 78c7929ac4f03d90e956cc1052208c646feaabf3
Author: Christian Lohmaier 
Date:   Mon Jun 20 21:55:08 2016 +0200

tdf#89657 sign Mac languagepack installer and force-start-close LO

starting LO once satisfies Gatekeeper's verification, even when the
langaugepack's content are added afterwards

Change-Id: Ie548df39a7ec07cc485c40148e4ca75101346798

diff --git a/setup_native/scripts/osx_install_languagepack.applescript 
b/setup_native/scripts/osx_install_languagepack.applescript
index cbd7743..49c8e54 100644
--- a/setup_native/scripts/osx_install_languagepack.applescript
+++ b/setup_native/scripts/osx_install_languagepack.applescript
@@ -143,6 +143,14 @@ end if
 -- touch extensions folder to have LO register bundled dictionaries
 set tarCommand to "/usr/bin/tar -C " & quoted form of (choice as string) & " 
-xjf " & quoted form of sourcedir & "/tarball.tar.bz2 && touch " & quoted form 
of (choice as string) & "/Contents/Resources/extensions"
 try
+   (* A start of unchanged LO must take place so Gatekeeper will verify
+  the signature prior to installing the languagepack
+   *)
+   if application choice is not running then
+   -- this will flash the startcenter once...
+   tell application choice to activate
+   tell application choice to quit
+   end if
do shell script tarCommand

 on error errMSG number errNUM
diff --git a/setup_native/source/mac/Info.plist.langpack 
b/setup_native/source/mac/Info.plist.langpack
index 372e645e..361a4b4 100644
--- a/setup_native/source/mac/Info.plist.langpack
+++ b/setup_native/source/mac/Info.plist.langpack
@@ -35,7 +35,7 @@
CFBundleShortVersionString
9
CFBundleIdentifier
-   ${BUNDLEIDENTIFIER}
+   [BUNDLEIDENTIFIER].langpack
CFBundleInfoDictionaryVersion
6.0
CFBundleName
diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index ac33798..95ccfe7 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -379,19 +379,27 @@ sub create_package
 $destfile = $subdir . "/" . $iconfile;
 installer::systemactions::copy_one_file($iconfileref, $destfile);
 
-my $installname = "Info.plist";
 my $infoplistfile = $ENV{'SRCDIR'} . 
"/setup_native/source/mac/Info.plist.langpack";
 if (! -f $infoplistfile) { installer::exiter::exit_program("ERROR: 
Could not find Apple script Info.plist: $infoplistfile!", "create_package"); }
-$destfile = $contentsfolder . "/" . $installname;
-installer::systemactions::copy_one_file($infoplistfile, $destfile);
-
+$destfile = "$contentsfolder/Info.plist";
 # Replacing variables in Info.plist
-$scriptfilecontent = installer::files::read_file($destfile);
+$scriptfilecontent = installer::files::read_file($infoplistfile);
 # replace_one_variable_in_shellscript($scriptfilecontent, 
$volume_name, "FULLPRODUCTNAME" );
 replace_one_variable_in_shellscript($scriptfilecontent, 
$volume_name_classic_app, "FULLAPPPRODUCTNAME" ); # OpenOffice.org Language Pack
+replace_one_variable_in_shellscript($scriptfilecontent, 
$ENV{'MACOSX_BUNDLE_IDENTIFIER'}, "BUNDLEIDENTIFIER" );
 installer::files::save_file($destfile, $scriptfilecontent);
 
 chdir $localfrom;
+
+if ( defined($ENV{'MACOSX_CODESIGNING_IDENTITY'}) && 
$ENV{'MACOSX_CODESIGNING_IDENTITY'} ne "" ) {
+my @lp_sign = ('codesign', '--verbose', '--sign', 
$ENV{'MACOSX_CODESIGNING_IDENTITY'}, '--deep', $appfolder);
+if (system(@lp_sign) == 0) {
+$infoline = "Success: \"@lp_sign\" executed 
successfully!\n";
+} else {
+$infoline = "ERROR: Could not codesign the languagepack 
using \"@lp_sign\"!\n";
+}
+push( @installer::globals::logfileinfo, $infoline);
+}
 }
 elsif ($volume_name_classic_app eq 'LibreOffice' || 
$volume_name_classic_app eq 'LibreOfficeDev')
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: setup_native/scripts

[Stephan Bergmann]

 setup_native/scripts/source/getuid.c |8 
 1 file changed, 8 insertions(+)

New commits:
commit 723719b41348e275c760c6c66bbc9619fafa37fe
Author: Stephan Bergmann 
Date:   Tue Jan 19 14:33:37 2016 +0100

Silence -Werror=nonnull (GCC 6)

Change-Id: I3aa5f4342ad362b0075d033df222467723ee002e

diff --git a/setup_native/scripts/source/getuid.c 
b/setup_native/scripts/source/getuid.c
index 9a9f826..2f1aaa4 100644
--- a/setup_native/scripts/source/getuid.c
+++ b/setup_native/scripts/source/getuid.c
@@ -123,7 +123,15 @@ int __lxstat(int n, const char *path, struct stat *buf)
 p_lstat = (int (*)(int n, const char *path, struct stat *buf))
 dlsym (RTLD_NEXT, "__lxstat");
 ret = (*p_lstat)(n, path, buf);
+#if defined __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wnonnull"
+// __lxstat may be declared in system headers as taking nonnull argument
+#endif
 assert(buf != NULL);
+#if defined __GNUC__
+#pragma GCC diagnostic pop
+#endif
 buf->st_uid = 0; /* root */
 buf->st_gid = 0; /* root */
 return ret;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: setup_native/scripts

[Christian Lohmaier]

 setup_native/scripts/osx_install_languagepack.applescript |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b89681bef2e492bccb9502079e042ff495b40c39
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Tue Mar 31 16:58:50 2015 +0200

tdf#90298 rescan for bundled extensions when installing Mac langpack

LO only scans for new extensions when the folder's timestamp is newer
than a timestamp file in the user's profile. When installing a
languagepack, the folder is set to the build-time of the package. touch
the dir to set it to install time and thus allow LO to pick up newly
installed dictionaries and thesaurus/hyphenation data.

Change-Id: I888f830d2325774cd98e3624c19d2be19d4d6db2

diff --git a/setup_native/scripts/osx_install_languagepack.applescript 
b/setup_native/scripts/osx_install_languagepack.applescript
index 735f141..cbd7743 100644
--- a/setup_native/scripts/osx_install_languagepack.applescript
+++ b/setup_native/scripts/osx_install_languagepack.applescript
@@ -140,7 +140,8 @@ if (button returned of result) is AbortLabel then
 end if
 *)
 
-set tarCommand to /usr/bin/tar -C   quoted form of (choice as string)   
-xjf   quoted form of sourcedir  /tarball.tar.bz2
+-- touch extensions folder to have LO register bundled dictionaries
+set tarCommand to /usr/bin/tar -C   quoted form of (choice as string)   
-xjf   quoted form of sourcedir  /tarball.tar.bz2  touch   quoted form 
of (choice as string)  /Contents/Resources/extensions
 try
do shell script tarCommand

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: setup_native/scripts

[Stephan Bergmann]

 setup_native/scripts/source/getuid.c |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 08476b7788530ff5ecb6eb379afc0a5998824f84
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Jan 8 14:04:37 2015 +0100

-Werror,-Wtautological-pointer-compare

Change-Id: I55db1220e234b92f5d0a3794f416154495da8b69

diff --git a/setup_native/scripts/source/getuid.c 
b/setup_native/scripts/source/getuid.c
index d3660f4..9a9f826 100644
--- a/setup_native/scripts/source/getuid.c
+++ b/setup_native/scripts/source/getuid.c
@@ -137,11 +137,9 @@ int __lxstat64(int n, const char *path, struct stat64 *buf)
 p_lstat = (int (*)(int n, const char *path, struct stat64 *buf))
 dlsym (RTLD_NEXT, __lxstat64);
 ret = (*p_lstat)(n, path, buf);
-if (buf != NULL)
-{
-buf-st_uid = 0;
-buf-st_gid = 0;
-}
+assert(buf != NULL);
+buf-st_uid = 0;
+buf-st_gid = 0;
 return ret;
 }
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: setup_native/scripts

[Stephan Bergmann]

 setup_native/scripts/source/getuid.c |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 077ad1a5ab6848255e0350df368c4f45ae73da9c
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Oct 27 21:55:52 2014 +0100

-Werror,-Wtautological-pointer-compare

(/usr/include/sys/stat.h annotates __lxstat params as __nonnull)

Change-Id: I4297c4a05f54bc35688b65dd1ddcdeb7bc7fc37b

diff --git a/setup_native/scripts/source/getuid.c 
b/setup_native/scripts/source/getuid.c
index 17ed60d..d3660f4 100644
--- a/setup_native/scripts/source/getuid.c
+++ b/setup_native/scripts/source/getuid.c
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include assert.h
 #include fcntl.h
 #include sys/types.h
 #include sys/stat.h
@@ -122,11 +123,9 @@ int __lxstat(int n, const char *path, struct stat *buf)
 p_lstat = (int (*)(int n, const char *path, struct stat *buf))
 dlsym (RTLD_NEXT, __lxstat);
 ret = (*p_lstat)(n, path, buf);
-if (buf != NULL)
-{
-buf-st_uid = 0; /* root */
-buf-st_gid = 0; /* root */
-}
+assert(buf != NULL);
+buf-st_uid = 0; /* root */
+buf-st_gid = 0; /* root */
 return ret;
 }
 #else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: setup_native/scripts

[Christian Lohmaier]

 setup_native/scripts/osx_install_languagepack.applescript |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit bd242a8768b8e2f457af581c782ef8a9f2ba0be7
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Jul 24 16:28:04 2013 +0200

fdo#67258 catch error when calling mdfind

This can be the case when spotlight is disabled. So just ignore any
error when trying to locate installed versions and let the user continue
with the manual selection instead of aborting.

Change-Id: I2c4e12652b8cb3b43af3ca6d8d553f0558f91858
Reviewed-on: https://gerrit.libreoffice.org/5069
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/setup_native/scripts/osx_install_languagepack.applescript 
b/setup_native/scripts/osx_install_languagepack.applescript
index 3b16499..735f141 100644
--- a/setup_native/scripts/osx_install_languagepack.applescript
+++ b/setup_native/scripts/osx_install_languagepack.applescript
@@ -63,7 +63,12 @@ if (button returned of result) is AbortLabel then
return 2
 end if
 
-set the found_ooos_all to (do shell script mdfind \kMDItemContentType == 
'com.apple.application-bundle'  kMDItemDisplayName == '[PRODUCTNAME]*'  
kMDItemDisplayName != '[FULLAPPPRODUCTNAME].app'\)  
+set found_ooos_all to 
+-- command might return an error if spotlight is disabled completely
+try
+   set found_ooos_all to (do shell script mdfind \kMDItemContentType == 
'com.apple.application-bundle'  kMDItemDisplayName == '[PRODUCTNAME]*'  
kMDItemDisplayName != '[FULLAPPPRODUCTNAME].app'\)
+end try
+set found_ooos_all to found_ooos_all  
   chooseMyOwn
 
 set found_ooos_all_paragraphs to paragraphs in found_ooos_all
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: setup_native/scripts solenv/bin

[Jan Holesovsky]

 setup_native/scripts/admin.pl |5 +++--
 solenv/bin/modules/installer/parameter.pm |6 --
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 2126303ec6acc70f18289dcfddeaaea6b08b7915
Author: Jan Holesovsky ke...@suse.cz
Date:   Wed Jul 10 07:52:44 2013 +0200

Use mkdtemp() so that 2 builds can package at the same time.

Change-Id: I86d01c3ec1267495bd664108fdcf2e5533d97430

diff --git a/setup_native/scripts/admin.pl b/setup_native/scripts/admin.pl
index 6fa2388..b7f4ce6 100644
--- a/setup_native/scripts/admin.pl
+++ b/setup_native/scripts/admin.pl
@@ -18,6 +18,7 @@
 
 use Cwd;
 use File::Copy;
+use File::Temp qw/ :mktemp /;
 
 
#
 # Global settings
@@ -29,7 +30,7 @@ BEGIN
 $targetdir = ;
 $databasepath = ;
 $starttime = ;
-$globaltempdirname = ooopackaging;
+$globaltempdirname = ooopackagingXX;
 $savetemppath = ;
 $msiinfo_available = 0;
 $path_displayed = 0;
@@ -961,7 +962,7 @@ sub get_temppath
 
 $temppath =~ s/\Q$separator\E\s*$//;# removing ending slashes and 
backslashes
 $temppath = $temppath . $separator . $globaltempdirname;
-create_directory_with_privileges($temppath, 777);
+$temppath = mkdtemp($temppath);
 
 my $dirsave = $temppath;
 
diff --git a/solenv/bin/modules/installer/parameter.pm 
b/solenv/bin/modules/installer/parameter.pm
index 9c18ca3..4475ec4 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -25,6 +25,7 @@ use installer::globals;
 use installer::logger;
 use installer::remover;
 use installer::systemactions;
+use File::Temp qw/ :mktemp /;
 
 
 # Parameter Operations
@@ -368,8 +369,9 @@ sub setglobalvariables
 {
 $installer::globals::temppath = $ENV{'TMPDIR'};
 $installer::globals::temppath =~ 
s/\Q$installer::globals::separator\E\s*$//;# removing ending slashes and 
backslashes
-$installer::globals::temppath .= $installer::globals::separator . 
'ooopackaging';
-
installer::systemactions::create_directory_with_privileges($installer::globals::temppath,
 777);
+$installer::globals::temppath .= $installer::globals::separator . 
'ooopackagingXX';
+$installer::globals::temppath = mkdtemp($installer::globals::temppath);
+
 my $dirsave = $installer::globals::temppath;
 
 if ( $installer::globals::compiler =~ /^unxmac/ )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits