diff --git a/lib/user-methods.js b/lib/user-methods.js index db93c236..58e7bed5 100644 --- a/lib/user-methods.js +++ b/lib/user-methods.js @@ -65,12 +65,12 @@ module.exports = function(realmConstructor) { } var methods = {}; - methods['adminUser'] = function(server, token) { + methods['adminUser'] = function(token) { 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); 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; } diff --git a/scripts/download-core.sh b/scripts/download-core.sh index 4f4bf00f..99eeef8f 100755 --- a/scripts/download-core.sh +++ b/scripts/download-core.sh @@ -5,7 +5,7 @@ set -o pipefail # Set to "latest" for the latest build. : ${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 echo "$REALM_CORE_VERSION" @@ -15,7 +15,6 @@ fi # The 'node' argument will result in realm-node build being downloaded. if [ "$1" = 'node' ]; then CORE_DIR="core-node" - SYNC_DIR="sync-node" if [ "$(uname)" = 'Darwin' ]; then PLATFORM_TAG="node-osx-" @@ -26,11 +25,12 @@ if [ "$1" = 'node' ]; then fi else CORE_DIR='core' - SYNC_DIR='sync' PLATFORM_TAG="" - SYNC_PLATFORM_TAG="cocoa-" fi +SYNC_DIR='sync' +SYNC_PLATFORM_TAG="cocoa-" + 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" @@ -56,6 +56,7 @@ download_core() { mkdir -p "$TMP_DIR" 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" || die "Downloading $DIR failed. Please try again once you have an Internet connection." mv "$TMP_TAR" "$TAR" diff --git a/src/object-store b/src/object-store index e4a0ff94..d8f5765c 160000 --- a/src/object-store +++ b/src/object-store @@ -1 +1 @@ -Subproject commit e4a0ff9493c1559fae7ec64a42fa87dc52be8fd2 +Subproject commit d8f5765c574357635e09e25cb2bad58c68d08939