diff --git a/CouchPotato.py b/CouchPotato.py index b4a6421..7de1a57 100755 --- a/CouchPotato.py +++ b/CouchPotato.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 from __future__ import print_function from logging import handlers from os.path import dirname diff --git a/README.md b/README.md index 00921ae..af8a9e6 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ CouchPotato ===== [![Join the chat at https://gitter.im/CouchPotato/CouchPotatoServer](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/CouchPotato/CouchPotatoServer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -[![Build Status](https://travis-ci.org/CouchPotato/CouchPotatoServer.svg?branch=develop)](https://travis-ci.org/CouchPotato/CouchPotatoServer) -[![Coverage Status](https://coveralls.io/repos/CouchPotato/CouchPotatoServer/badge.svg?branch=develop&service=github)](https://coveralls.io/github/CouchPotato/CouchPotatoServer?branch=develop) +[![Build Status](https://travis-ci.org/CouchPotato/CouchPotatoServer.svg?branch=master)](https://travis-ci.org/CouchPotato/CouchPotatoServer) +[![Coverage Status](https://coveralls.io/repos/CouchPotato/CouchPotatoServer/badge.svg?branch=master&service=github)](https://coveralls.io/github/CouchPotato/CouchPotatoServer?branch=master) CouchPotato (CP) is an automatic NZB and torrent downloader. You can keep a "movies I want"-list and it will search for NZBs/torrents of these movies every X hours. Once a movie is found, it will send it to SABnzbd or download the torrent to a specified directory. @@ -42,13 +42,13 @@ Linux: * 'cd' to the folder of your choosing. * Install [PyOpenSSL](https://pypi.python.org/pypi/pyOpenSSL) with `pip install --upgrade pyopenssl` * Run `git clone https://github.com/CouchPotato/CouchPotatoServer.git` -* Then do `python CouchPotatoServer/CouchPotato.py` to start +* Then do `python2 CouchPotatoServer/CouchPotato.py` to start * (Ubuntu / Debian with upstart) To run on boot copy the init script `sudo cp CouchPotatoServer/init/ubuntu /etc/init.d/couchpotato` * (Ubuntu / Debian with upstart) Copy the default paths file `sudo cp CouchPotatoServer/init/ubuntu.default /etc/default/couchpotato` * (Ubuntu / Debian with upstart) Change the paths inside the default file `sudo nano /etc/default/couchpotato` * (Ubuntu / Debian with upstart) Make it executable `sudo chmod +x /etc/init.d/couchpotato` * (Ubuntu / Debian with upstart) Add it to defaults `sudo update-rc.d couchpotato defaults` -* (Linux with systemd) To run on boot copy the systemd config `sudo cp CouchPotatoServer/init/couchpotato.service /etc/systemd/system/couchpotato.service` +* (Linux with systemd)To run on boot copy the systemd config `sudo cp CouchPotatoServer/init/couchpotato.service /etc/systemd/system/couchpotato.service` * (Linux with systemd) Update the systemd config file with your user and path to CouchPotato.py * (Linux with systemd) Enable it at boot with `sudo systemctl enable couchpotato` * Open your browser and go to `http://localhost:5050/` diff --git a/version.py b/version.py index d3f24ba..12e96b5 100644 --- a/version.py +++ b/version.py @@ -1,2 +1,2 @@ VERSION = None -BRANCH = 'develop' +BRANCH = 'master'