mirror of
https://github.com/status-im/realm-js.git
synced 2025-02-23 03:38:16 +00:00
remove unneded server argument for adminUser, update care and sync dependencies
This commit is contained in:
parent
e52351fc50
commit
60d9da1b44
@ -65,12 +65,12 @@ module.exports = function(realmConstructor) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var methods = {};
|
var methods = {};
|
||||||
methods['adminUser'] = function(server, token) {
|
methods['adminUser'] = function(token) {
|
||||||
var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
|
var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
|
||||||
var r = Math.random()*16|0, v = c == 'x' ? r : (r&0x3|0x8);
|
var r = Math.random()*16|0, v = c == 'x' ? r : (r&0x3|0x8);
|
||||||
return v.toString(16);
|
return v.toString(16);
|
||||||
});
|
});
|
||||||
var user = realmConstructor.Sync.User.createUser(server, uuid, token, true);
|
var user = realmConstructor.Sync.User.createUser('', uuid, token, true);
|
||||||
return user;
|
return user;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ set -o pipefail
|
|||||||
|
|
||||||
# Set to "latest" for the latest build.
|
# Set to "latest" for the latest build.
|
||||||
: ${REALM_CORE_VERSION:=2.1.0}
|
: ${REALM_CORE_VERSION:=2.1.0}
|
||||||
: ${REALM_SYNC_VERSION:=1.0.0-BETA-2.0}
|
: ${REALM_SYNC_VERSION:=1.0.0-BETA-3.3}
|
||||||
|
|
||||||
if [ "$1" = '--version' ]; then
|
if [ "$1" = '--version' ]; then
|
||||||
echo "$REALM_CORE_VERSION"
|
echo "$REALM_CORE_VERSION"
|
||||||
@ -15,7 +15,6 @@ fi
|
|||||||
# The 'node' argument will result in realm-node build being downloaded.
|
# The 'node' argument will result in realm-node build being downloaded.
|
||||||
if [ "$1" = 'node' ]; then
|
if [ "$1" = 'node' ]; then
|
||||||
CORE_DIR="core-node"
|
CORE_DIR="core-node"
|
||||||
SYNC_DIR="sync-node"
|
|
||||||
|
|
||||||
if [ "$(uname)" = 'Darwin' ]; then
|
if [ "$(uname)" = 'Darwin' ]; then
|
||||||
PLATFORM_TAG="node-osx-"
|
PLATFORM_TAG="node-osx-"
|
||||||
@ -26,11 +25,12 @@ if [ "$1" = 'node' ]; then
|
|||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
CORE_DIR='core'
|
CORE_DIR='core'
|
||||||
SYNC_DIR='sync'
|
|
||||||
PLATFORM_TAG=""
|
PLATFORM_TAG=""
|
||||||
SYNC_PLATFORM_TAG="cocoa-"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
SYNC_DIR='sync'
|
||||||
|
SYNC_PLATFORM_TAG="cocoa-"
|
||||||
|
|
||||||
CORE_DOWNLOAD_FILE="realm-core-$PLATFORM_TAG$REALM_CORE_VERSION.tar.xz"
|
CORE_DOWNLOAD_FILE="realm-core-$PLATFORM_TAG$REALM_CORE_VERSION.tar.xz"
|
||||||
SYNC_DOWNLOAD_FILE="realm-sync-$SYNC_PLATFORM_TAG$REALM_SYNC_VERSION.tar.xz"
|
SYNC_DOWNLOAD_FILE="realm-sync-$SYNC_PLATFORM_TAG$REALM_SYNC_VERSION.tar.xz"
|
||||||
|
|
||||||
@ -56,6 +56,7 @@ download_core() {
|
|||||||
mkdir -p "$TMP_DIR"
|
mkdir -p "$TMP_DIR"
|
||||||
|
|
||||||
if [ ! -f "$TAR" ]; then
|
if [ ! -f "$TAR" ]; then
|
||||||
|
echo "https://static.realm.io/downloads/$SERVER_DIR/$DOWNLOAD_FILE"
|
||||||
curl -f -L -s "https://static.realm.io/downloads/$SERVER_DIR/$DOWNLOAD_FILE" -o "$TMP_TAR" ||
|
curl -f -L -s "https://static.realm.io/downloads/$SERVER_DIR/$DOWNLOAD_FILE" -o "$TMP_TAR" ||
|
||||||
die "Downloading $DIR failed. Please try again once you have an Internet connection."
|
die "Downloading $DIR failed. Please try again once you have an Internet connection."
|
||||||
mv "$TMP_TAR" "$TAR"
|
mv "$TMP_TAR" "$TAR"
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit e4a0ff9493c1559fae7ec64a42fa87dc52be8fd2
|
Subproject commit d8f5765c574357635e09e25cb2bad58c68d08939
|
Loading…
x
Reference in New Issue
Block a user