diff options
| -rwxr-xr-x | etc/ci/upload_nightly.sh | 8 | ||||
| -rw-r--r-- | python/servo/package_commands.py | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/etc/ci/upload_nightly.sh b/etc/ci/upload_nightly.sh index 842042ffd62..3e8f0f9580f 100755 --- a/etc/ci/upload_nightly.sh +++ b/etc/ci/upload_nightly.sh @@ -28,7 +28,7 @@ upload() { main() { - if [[ "${#}" != 1 ]]; then + if (( "${#}" != 1 )); then usage >&2 return 1 fi @@ -41,13 +41,13 @@ main() { package=target/arm-linux-androideabi/release/*."${extension}" elif [[ "${platform}" == "linux" ]]; then extension=tar.gz - package=target/*."${extension}" + package=target/release/*."${extension}" elif [[ "${platform}" == "mac" ]]; then extension=dmg - package=target/*."${extension}" + package=target/release/*."${extension}" elif [[ "${platform}" == "macbrew" ]]; then extension=tar.gz - package=target/brew/*."${extension}" + package=target/release/brew/*."${extension}" elif [[ "${platform}" == "windows" ]]; then extension=msi package=target/release/msi/*.msi diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index 5ec88e4615c..91151725fc5 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -156,7 +156,7 @@ class PackageCommands(CommandBase): dir_to_root = self.get_top_dir() print("Creating Servo.app") - dir_to_dmg = path.join(path.dirname(dir_to_build), 'dmg') + dir_to_dmg = path.join(dir_to_build, 'dmg') dir_to_app = path.join(dir_to_dmg, 'Servo.app') dir_to_resources = path.join(dir_to_app, 'Contents', 'Resources') if path.exists(dir_to_dmg): @@ -217,7 +217,7 @@ class PackageCommands(CommandBase): print("Creating dmg") os.symlink('/Applications', path.join(dir_to_dmg, 'Applications')) - dmg_path = path.join(path.dirname(dir_to_build), "servo-tech-demo.dmg") + dmg_path = path.join(dir_to_build, "servo-tech-demo.dmg") try: subprocess.check_call(['hdiutil', 'create', '-volname', 'Servo', dmg_path, '-srcfolder', dir_to_dmg]) @@ -229,8 +229,8 @@ class PackageCommands(CommandBase): print("Packaged Servo into " + dmg_path) print("Creating brew package") - dir_to_brew = path.join(path.dirname(dir_to_build), 'brew_tmp') - dir_to_tar = path.join(path.dirname(dir_to_build), 'brew') + dir_to_brew = path.join(dir_to_build, 'brew_tmp') + dir_to_tar = path.join(dir_to_build, 'brew') if not path.exists(dir_to_tar): os.makedirs(dir_to_tar) tar_path = path.join(dir_to_tar, "servo.tar.gz") @@ -320,7 +320,7 @@ class PackageCommands(CommandBase): os.close(runservo) print("Creating tarball") - tar_path = path.join(self.get_target_dir(), 'servo-tech-demo.tar.gz') + tar_path = path.join(path.dirname(binary_path), 'servo-tech-demo.tar.gz') archive_deterministically(dir_to_temp, tar_path, prepend_path='servo/') |