Skip to content
This repository was archived by the owner on Dec 31, 2021. It is now read-only.

Commit 05ad585

Browse files
author
Brian Hornsby
committed
Merge branch 'release/3.0.0'
2 parents 3ef9ac8 + 16794f0 commit 05ad585

9 files changed

Lines changed: 39 additions & 409 deletions

File tree

‎.gitignore‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,4 @@
1-
2-
resources/__init__.pyo
3-
4-
resources/__init__.pyc
5-
6-
xbmcsettings.pyc
7-
8-
xbmcsettings.pyo
9-
10-
xbmcutils.pyc
11-
12-
xbmcutils.pyo
13-
14-
resources/lib/__init__.pyc
15-
1+
resources/*.pyc
2+
resources/lib/*.pyc
163
*.pyc
4+
*.pyo

‎README.md‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
OpenVPN for XBMC
1+
OpenVPN for Kodi
22
==========
3-
A script that allows you to control OpenVPN from within XBMC.
3+
A script that allows you to control OpenVPN from within Kodi.
44

55
Features
66
-----
7-
- Start and stop OpenVPN from with XBMC.
7+
- Start and stop OpenVPN from with Kodi.
88
- Setup multiple VPN connections.
99
- Display current geo-location.
1010

@@ -15,7 +15,7 @@ Screenshots
1515

1616
Installation
1717
------
18-
Download the latest zip file and install the addon. See [http://wiki.xbmc.org/?title=Add-ons#How_to_install_from_a_ZIP_file][1] for more details on installing addons from zip file.
18+
Download the latest zip file and install the addon. See [http://kodi.wiki/view/HOW-TO:Install_an_Add-on_from_a_zip_file][1] for more details on installing addons from zip file.
1919

2020
Usage
2121
------
@@ -51,9 +51,17 @@ The following settings are available.
5151

5252
**Password is required**: Set to true if a password is required when using sudo. Default: true
5353

54+
FAQ
55+
---
56+
57+
**Is this plugin available in a Kodi addons repository?** No
58+
59+
**I can't get the OpenVPN plugin to work on Raspberry Pi?** Before asking me for help I suggest reading the following [guide][3].
60+
5461
License
5562
------
56-
OpenVPN for XBMC is licensed under the [GPL 3.0 license][2].
63+
OpenVPN for Kodi is licensed under the [GPL 3.0 license][2].
5764

58-
[1]: http://wiki.xbmc.org/?title=Add-ons#How_to_install_from_a_ZIP_file
65+
[1]: http://kodi.wiki/view/HOW-TO:Install_an_Add-on_from_a_zip_file
5966
[2]: http://www.gnu.org/licenses/gpl-3.0.html
67+
[3]: http://forums.tvaddons.ag/threads/24769-How-to-set-up-your-VPN-on-raspberry-pi-using-Brain-Hornsby-Openvpn-for-XBMC

‎addon.xml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<addon id="script.openvpn" name="OpenVPN" version="2.1.0" provider-name="brianhornsby">
2+
<addon id="script.openvpn" name="OpenVPN" version="3.0.0" provider-name="brianhornsby">
33
<requires>
44
<import addon="xbmc.python" version="2.1.0"/>
55
<import addon="script.module.beautifulsoup" version="3.0.8"/>
66
</requires>
77
<extension point="xbmc.python.script" library="default.py"/>
88
<extension point="xbmc.addon.metadata">
99
<platform>all</platform>
10-
<summary lang="en">OpenVPN addon for XBMC.</summary>
11-
<description lang="en">This addon allows you to set up a number of OpenVPN configurations, which you can then run from XBMC.
12-
For more information on setting up this addon see http://brianhornsby.com/xbmc_plugins/openvpn</description>
10+
<summary lang="en">OpenVPN addon for Kodi.</summary>
11+
<description lang="en">This addon allows you to set up a number of OpenVPN configurations, which you can then run from Kodi.
12+
For more information on setting up this addon see http://brianhornsby.com/kodi_plugins/openvpn</description>
13+
<license>GNU GENERAL PUBLIC LICENSE. Version 3, 29 June 2007</license>
14+
<website>http://brianhornsby.com/kodi_addons/openvpn</website>
15+
<source>https://github.com/brianhornsby/script.openvpn</source>
1316
</extension>
1417
</addon>

‎changelog.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
*** 3.0.0 ***
2+
Updated plugin to use Kodi name. Updated copyright date. [1a88f6f]
3+
14
*** 2.1.0 ***
25
Updated xbmc.python version. Fixed issue with reading running OpenVPN configuration on OpenELEC. [0e132c6]
36
Changed country flag images to https://github.com/koppi/iso-country-flags-svg-collection. [3dc6b7e]

‎default.py‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#/*
22
# *
3-
# * OpenVPN for XBMC.
3+
# * OpenVPN for Kodi.
44
# *
5-
# * Copyright (C) 2013 Brian Hornsby
5+
# * Copyright (C) 2015 Brian Hornsby
66
# *
77
# * This program is free software: you can redistribute it and/or modify
88
# * it under the terms of the GNU General Public License as published by
@@ -30,15 +30,14 @@
3030
from BeautifulSoup import BeautifulSoup
3131

3232
import resources.lib.openvpn as vpn
33-
import resources.lib.xbmcsettings as settings
34-
import resources.lib.xbmcutils as utils
33+
import resources.lib.kodisettings as settings
34+
import resources.lib.kodiutils as utils
3535

3636
# Set some global values.
37-
_xbmcrevision = xbmc.getInfoLabel('System.BuildVersion')
3837
_addonid = 'script.openvpn'
3938

4039
# Initialise settings.
41-
_settings = settings.XBMCSettings(_addonid, sys.argv)
40+
_settings = settings.KodiSettings(_addonid, sys.argv)
4241

4342
# Get addon information.
4443
_addonname = _settings.get_name()

‎resources/images/index.html‎

Lines changed: 0 additions & 371 deletions
This file was deleted.

resources/lib/xbmcsettings.py renamed to resources/lib/kodisettings.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#/*
22
# *
3-
# * OpenVPN for XBMC.
3+
# * OpenVPN for Kodi.
44
# *
5-
# * Copyright (C) 2013 Brian Hornsby
5+
# * Copyright (C) 2015 Brian Hornsby
66
# *
77
# * This program is free software: you can redistribute it and/or modify
88
# * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
2323
import xbmc
2424

2525

26-
class XBMCSettings:
26+
class KodiSettings:
2727
def __init__(self, addonid, argv):
2828
self.__addon__ = xbmcaddon.Addon(id=addonid)
2929
self.__argv__ = argv

resources/lib/xbmcutils.py renamed to resources/lib/kodiutils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#/*
22
# *
3-
# * OpenVPN for XBMC.
3+
# * OpenVPN for Kodi.
44
# *
5-
# * Copyright (C) 2013 Brian Hornsby
5+
# * Copyright (C) 2015 Brian Hornsby
66
# *
77
# * This program is free software: you can redistribute it and/or modify
88
# * it under the terms of the GNU General Public License as published by

‎resources/lib/openvpn.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#/*
22
# *
3-
# * OpenVPN for XBMC.
3+
# * OpenVPN for Kodi.
44
# *
5-
# * Copyright (C) 2013 Brian Hornsby
5+
# * Copyright (C) 2015 Brian Hornsby
66
# *
77
# * This program is free software: you can redistribute it and/or modify
88
# * it under the terms of the GNU General Public License as published by

0 commit comments

Comments
 (0)