From 63f64cd66086f302f53456f29f60b1e28c8ee178 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Fri, 29 Jul 2016 19:07:48 -0700
Subject: [PATCH] minor fixes

---
 .appveyor.yml    | 6 +++---
 .travis.yml      | 2 +-
 release/rtool.py | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 7d5d7b1b0..13782ee83 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,10 +5,10 @@ environment:
   CI_DEPS: codecov>=2.0.5
   CI_COMMANDS: codecov
   matrix:
-    - PYTHON: "C:\\Python27"
-      TOXENV: "py27"
     - PYTHON: "C:\\Python35"
       TOXENV: "py35"
+    - PYTHON: "C:\\Python27"
+      TOXENV: "py27"
 
   SNAPSHOT_HOST:
     secure: NeTo57s2rJhCd/mjKHetXVxCFd3uhr8txnjnAXD1tUI=
@@ -31,7 +31,7 @@ deploy_script:
   ps: |
     if(
       ($Env:TOXENV -match "py35") -and
-      (($Env:APPVEYOR_REPO_BRANCH -match "builds") -or ($Env:APPVEYOR_REPO_TAG -match "true"))
+      (($Env:APPVEYOR_REPO_BRANCH -match "master") -or ($Env:APPVEYOR_REPO_TAG -match "true"))
       ) {
       pip install -U virtualenv
       .\dev.ps1
diff --git a/.travis.yml b/.travis.yml
index 09474c05b..a8301ec82 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,7 +57,7 @@ script: set -o pipefail; python -m tox -- --cov netlib --cov mitmproxy --cov pat
 
 after_success:
   - |
-    if [[ $BDIST == "1" && $TRAVIS_PULL_REQUEST == "false" && ($TRAVIS_BRANCH == "builds" || -n $TRAVIS_TAG) ]]
+    if [[ $BDIST == "1" && $TRAVIS_PULL_REQUEST == "false" && ($TRAVIS_BRANCH == "master" || -n $TRAVIS_TAG) ]]
     then
         git fetch --unshallow
         ./dev.sh 3.5
diff --git a/release/rtool.py b/release/rtool.py
index 051a51889..45e1416e6 100755
--- a/release/rtool.py
+++ b/release/rtool.py
@@ -12,7 +12,7 @@ import subprocess
 import sys
 import tarfile
 import zipfile
-from os.path import join, normpath, dirname, exists, basename
+from os.path import join, abspath, normpath, dirname, exists, basename
 
 import click
 import pysftp
@@ -34,7 +34,7 @@ else:
     def Archive(name):
         return tarfile.open(name, "w:gz")
 
-ROOT_DIR = normpath(join(dirname(__file__), ".."))
+ROOT_DIR = abspath(join(dirname(__file__), ".."))
 RELEASE_DIR = join(ROOT_DIR, "release")
 
 BUILD_DIR = join(RELEASE_DIR, "build")