mirror of
https://github.com/laurent22/joplin.git
synced 2025-01-17 18:44:45 +02:00
cb3e1cf1e9
commit 2fb6cee90174bfcc02f77ba1606bfd8c4e2c8fc8 Merge: 4e303be85f db509955f6 Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 16:24:07 2020 +0100 Merge branch 'dev' into rn_63 commit 4e303be85f7b3162b7e5b96e18557da13acfc988 Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 16:14:39 2020 +0100 Clean up commit e3a37ec2d6f3e6cc07c018b11b3f80ca8256063e Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 15:57:55 2020 +0100 Use different script for pre-commit and manual start commit bd236648fcd92a812cd16369dfa2238d38c6638f Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 15:56:45 2020 +0100 Removed RN eslint config commit e7feda41c9b473cd18768f2ce7686611fa2b3d08 Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 15:27:08 2020 +0100 Revert "Disable git hook for now" This reverts commit 89263ac7425bae5b03b60742ab186441217b37dc. commit cfd63fe46fbc714c065f13dd9add5a0b8e18bf1f Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 13:02:32 2020 +0100 Ask permission to use geo-location commit 66059939a38460ba05c09eed7f3b19fc4ead924c Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 12:26:20 2020 +0100 Fixed WebView race condition commit 1e0d2b7b86d88629f19ae6574f73c945d422d0b5 Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 11:56:21 2020 +0100 Fixed webview issues commit f537d22d7fc4bcf6ddb54a4faadf72f585ae271c Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 11:08:29 2020 +0100 Improve resource file watching commit eec32cf70aaf69b04a703ce49c3ede48a6ac1067 Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 18:40:13 2020 +0100 Removed cache package dependency and implemented one more suitable for React Native commit efa346fea48414c98c1e577bf0d74a6e90a78044 Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 14:57:21 2020 +0100 iOS: Added fonts to Info.plist although it was working without it commit 572b647bc0ff5b12ddd555ad7ca2bb18ccaeb512 Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 14:56:49 2020 +0100 Specify content-type header for OneDrive to prevent network error commit bcedf6c7f0c35a428fd1c0800d4f17de662a49ff Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:45:01 2020 +0100 iOS: Disable long press menu since it is already built-in commit 7359dd61d1a609dbfce87b0deb169b8c5e2ace14 Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:37:40 2020 +0100 Removed unused react-native-device-info commit 2d63ab36d32775f07236dae62f6cc7792dac435a Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:35:54 2020 +0100 iOS: Fixed taking a picture commit 8e2875a91c87b48ba3e230e9296d032cd05a267c Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:11:13 2020 +0100 iOS: Restored camera roll functionality commit 75f5edf2addfe3590d1a37bdac99680cb1a5c84c Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 11:40:13 2020 +0100 iOS: Fixed build settings commit b220c984198e78a2401387f4385bfdd331852d78 Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 11:40:03 2020 +0100 iOS: Got images to work with WebKit commit c34b43e841b768104f19e86900133a1986b53af9 Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 10:24:52 2020 +0100 iOS: Restore more settings commit 32997611e625f1775df05af966782ae763c1aa17 Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 10:15:14 2020 +0100 iOS: Added back icons and other properties commit b5811d7f7cff227a30bb10ecad76f52cb212170a Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 23:53:14 2020 +0100 Got iOS build to work commit dc6d7c00e0048088cca653d5214d1cc4679ca005 Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 18:40:06 2020 +0100 Imported old settings in gradle build commit dff59f560317d260b8540a9324bcdd5e749a0c0b Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 18:20:00 2020 +0100 Restored sharing commit 0bdb449e72ef1766bd5aac878f44106c36e662c2 Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 17:25:40 2020 +0100 Updated NoteBodyViewer commit 0c0d228815251cfaf66ba25a276852d32192f106 Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 16:54:42 2020 +0100 Fixed networking commit 6ff45ce485d59e3e0fe66a9658a678499c887058 Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 13:11:00 2020 +0100 Fixed document picker commit cc889182b66052b8dfad03b46121e6a14763a51a Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 12:56:27 2020 +0100 Added back support for alarms commit 040261abfad89e5a58617d4c2d4f811d324ea488 Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 22:04:49 2020 +0100 Fixed Clipboard and remove image-picker package commit 1077ad8f16481afcc63d92020e91cd37f077f207 Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 21:54:52 2020 +0100 Fixed Select Alarm dialog and PoorManIntervals class commit 8296676fd52878b2f1cc2028a099f31909e6f286 Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 21:32:52 2020 +0100 Fixed icons and warnings commit 3b0e3f6f43c83bb103132e8296d3887fccd386b5 Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 17:02:59 2020 +0100 Got app to build again commit 89263ac7425bae5b03b60742ab186441217b37dc Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:41:17 2020 +0100 Disable git hook for now commit d6da162f674f94ba2c462268e39c161fa6126220 Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:39:12 2020 +0100 Restored back all RN packages commit 7f8ce3732cf4c8ff6dcbcc0a8918c680adadd3f4 Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:13:12 2020 +0100 Restored base packages commit ea59726eb3e0414afcdbe8af30a7765875239225 Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:05:17 2020 +0100 Started over from scratch
184 lines
5.6 KiB
Bash
Executable File
184 lines
5.6 KiB
Bash
Executable File
#!/usr/bin/env sh
|
|
|
|
#
|
|
# Copyright 2015 the original author or authors.
|
|
#
|
|
# Licensed 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
|
|
#
|
|
# https://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.
|
|
#
|
|
|
|
##############################################################################
|
|
##
|
|
## Gradle start up script for UN*X
|
|
##
|
|
##############################################################################
|
|
|
|
# Attempt to set APP_HOME
|
|
# Resolve links: $0 may be a link
|
|
PRG="$0"
|
|
# Need this for relative symlinks.
|
|
while [ -h "$PRG" ] ; do
|
|
ls=`ls -ld "$PRG"`
|
|
link=`expr "$ls" : '.*-> \(.*\)$'`
|
|
if expr "$link" : '/.*' > /dev/null; then
|
|
PRG="$link"
|
|
else
|
|
PRG=`dirname "$PRG"`"/$link"
|
|
fi
|
|
done
|
|
SAVED="`pwd`"
|
|
cd "`dirname \"$PRG\"`/" >/dev/null
|
|
APP_HOME="`pwd -P`"
|
|
cd "$SAVED" >/dev/null
|
|
|
|
APP_NAME="Gradle"
|
|
APP_BASE_NAME=`basename "$0"`
|
|
|
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
|
|
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
|
MAX_FD="maximum"
|
|
|
|
warn () {
|
|
echo "$*"
|
|
}
|
|
|
|
die () {
|
|
echo
|
|
echo "$*"
|
|
echo
|
|
exit 1
|
|
}
|
|
|
|
# OS specific support (must be 'true' or 'false').
|
|
cygwin=false
|
|
msys=false
|
|
darwin=false
|
|
nonstop=false
|
|
case "`uname`" in
|
|
CYGWIN* )
|
|
cygwin=true
|
|
;;
|
|
Darwin* )
|
|
darwin=true
|
|
;;
|
|
MINGW* )
|
|
msys=true
|
|
;;
|
|
NONSTOP* )
|
|
nonstop=true
|
|
;;
|
|
esac
|
|
|
|
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
|
|
|
# Determine the Java command to use to start the JVM.
|
|
if [ -n "$JAVA_HOME" ] ; then
|
|
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
|
# IBM's JDK on AIX uses strange locations for the executables
|
|
JAVACMD="$JAVA_HOME/jre/sh/java"
|
|
else
|
|
JAVACMD="$JAVA_HOME/bin/java"
|
|
fi
|
|
if [ ! -x "$JAVACMD" ] ; then
|
|
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
|
|
|
Please set the JAVA_HOME variable in your environment to match the
|
|
location of your Java installation."
|
|
fi
|
|
else
|
|
JAVACMD="java"
|
|
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
|
|
|
Please set the JAVA_HOME variable in your environment to match the
|
|
location of your Java installation."
|
|
fi
|
|
|
|
# Increase the maximum file descriptors if we can.
|
|
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
|
MAX_FD_LIMIT=`ulimit -H -n`
|
|
if [ $? -eq 0 ] ; then
|
|
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
|
MAX_FD="$MAX_FD_LIMIT"
|
|
fi
|
|
ulimit -n $MAX_FD
|
|
if [ $? -ne 0 ] ; then
|
|
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
|
fi
|
|
else
|
|
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
|
fi
|
|
fi
|
|
|
|
# For Darwin, add options to specify how the application appears in the dock
|
|
if $darwin; then
|
|
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
|
fi
|
|
|
|
# For Cygwin or MSYS, switch paths to Windows format before running java
|
|
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
|
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
|
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
|
JAVACMD=`cygpath --unix "$JAVACMD"`
|
|
|
|
# We build the pattern for arguments to be converted via cygpath
|
|
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
|
SEP=""
|
|
for dir in $ROOTDIRSRAW ; do
|
|
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
|
SEP="|"
|
|
done
|
|
OURCYGPATTERN="(^($ROOTDIRS))"
|
|
# Add a user-defined pattern to the cygpath arguments
|
|
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
|
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
|
fi
|
|
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
|
i=0
|
|
for arg in "$@" ; do
|
|
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
|
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
|
|
|
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
|
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
|
else
|
|
eval `echo args$i`="\"$arg\""
|
|
fi
|
|
i=`expr $i + 1`
|
|
done
|
|
case $i in
|
|
0) set -- ;;
|
|
1) set -- "$args0" ;;
|
|
2) set -- "$args0" "$args1" ;;
|
|
3) set -- "$args0" "$args1" "$args2" ;;
|
|
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
|
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
|
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
|
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
|
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
|
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
|
esac
|
|
fi
|
|
|
|
# Escape application args
|
|
save () {
|
|
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
|
echo " "
|
|
}
|
|
APP_ARGS=`save "$@"`
|
|
|
|
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
|
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
|
|
|
exec "$JAVACMD" "$@"
|