Private GIT

Skip to content
Snippets Groups Projects
Commit 82ec4162 authored by Adelscott's avatar Adelscott
Browse files

Update vers mon repo

sarakha63 remplacé par Adelscott
parent daebcf87
No related branches found
No related tags found
No related merge requests found
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<tr><td class="infoTableHeader">Python Version: </td><td class="infoTableCell">$sys.version[:120]</td></tr> <tr><td class="infoTableHeader">Python Version: </td><td class="infoTableCell">$sys.version[:120]</td></tr>
<tr class="infoTableSeperator"><td class="infoTableHeader"><i class="icon16-sb"></i> Homepage </td><td><a href="http://www.sickbeard.com/">http://www.sickbeard.com/</a></td></tr> <tr class="infoTableSeperator"><td class="infoTableHeader"><i class="icon16-sb"></i> Homepage </td><td><a href="http://www.sickbeard.com/">http://www.sickbeard.com/</a></td></tr>
<tr><td class="infoTableHeader"><i class="icon16-web"></i> Forums </td><td><a href="http://sickbeard.com/forums/viewtopic.php?f=9&t=2386">http://sickbeard.com/forums/</a></td></tr> <tr><td class="infoTableHeader"><i class="icon16-web"></i> Forums </td><td><a href="http://sickbeard.com/forums/viewtopic.php?f=9&t=2386">http://sickbeard.com/forums/</a></td></tr>
<tr><td class="infoTableHeader"><i class="icon16-github"></i> Source </td><td><a href="https://github.com/sarakha63/Sick-Beard/">https://github.com/sarakha63/Sick-Beard/</a></td></tr> <tr><td class="infoTableHeader"><i class="icon16-github"></i> Source </td><td><a href="https://github.com/Adelscott/Sick-Beard/">https://github.com/Adelscott/Sick-Beard/</a></td></tr>
<tr><td class="infoTableHeader"><i class="icon16-win"></i> Bug Tracker &amp;<br/> Windows Builds </td><td><a href="http://code.google.com/p/sickbeard/">http://code.google.com/p/sickbeard/</a></td></tr> <tr><td class="infoTableHeader"><i class="icon16-win"></i> Bug Tracker &amp;<br/> Windows Builds </td><td><a href="http://code.google.com/p/sickbeard/">http://code.google.com/p/sickbeard/</a></td></tr>
<tr><td class="infoTableHeader"><i class="icon16-mirc"></i> Internet Relay Chat </td><td><a href="irc://irc.freenode.net/#sickbeard"><i>#sickbeard</i> on <i>irc.freenode.net</i></a></td></tr> <tr><td class="infoTableHeader"><i class="icon16-mirc"></i> Internet Relay Chat </td><td><a href="irc://irc.freenode.net/#sickbeard"><i>#sickbeard</i> on <i>irc.freenode.net</i></a></td></tr>
</table> </table>
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<li> <li>
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=L2EWZMTRPW2SE" target="_blank"><img src="$sbRoot/images/like.png">Like this interface!</a> <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=L2EWZMTRPW2SE" target="_blank"><img src="$sbRoot/images/like.png">Like this interface!</a>
</li> </li>
<li><a href="https://github.com/sarakha63/Sick-Beard/commits/master" onclick="window.open(this.href); return false;"><img src="$sbRoot/images/menu/github-16.png" alt="" title="git" /></i>Changelog</a></li> <li><a href="https://github.com/Adelscott/Sick-Beard/commits/development" onclick="window.open(this.href); return false;"><img src="$sbRoot/images/menu/github-16.png" alt="" title="git" /></i>Changelog</a></li>
<li><a href="$sbRoot/manage/manageSearches/forceVersionCheck"><img src="$sbRoot/images/menu/update16.png" alt="" width="16" height="16" />Update</a></li> <li><a href="$sbRoot/manage/manageSearches/forceVersionCheck"><img src="$sbRoot/images/menu/update16.png" alt="" width="16" height="16" />Update</a></li>
<li><a href="$sbRoot/home/restart/?pid=$sbPID" class="confirm"><img src="$sbRoot/images/menu/restart16.png" alt="" width="16" height="16" />Restart</a></li> <li><a href="$sbRoot/home/restart/?pid=$sbPID" class="confirm"><img src="$sbRoot/images/menu/restart16.png" alt="" width="16" height="16" />Restart</a></li>
<li><a href="$sbRoot/home/shutdown/?pid=$sbPID" class="confirm"><img src="$sbRoot/images/menu/shutdown16.png" alt="" width="16" height="16" />Shutdown</a></li> <li><a href="$sbRoot/home/shutdown/?pid=$sbPID" class="confirm"><img src="$sbRoot/images/menu/shutdown16.png" alt="" width="16" height="16" />Shutdown</a></li>
......
...@@ -116,7 +116,7 @@ class WindowsUpdateManager(UpdateManager): ...@@ -116,7 +116,7 @@ class WindowsUpdateManager(UpdateManager):
self._newest_version = None self._newest_version = None
self.gc_url = 'http://code.google.com/p/sickbeard/downloads/list' self.gc_url = 'http://code.google.com/p/sickbeard/downloads/list'
self.version_url = 'https://raw.github.com/sarakha63/Sick-Beard/windows_binaries/updates.txt' self.version_url = 'https://raw.github.com/Adelscott/Sick-Beard/windows_binaries/updates.txt'
def _find_installed_version(self): def _find_installed_version(self):
return int(sickbeard.version.SICKBEARD_VERSION[6:]) return int(sickbeard.version.SICKBEARD_VERSION[6:])
...@@ -316,7 +316,7 @@ class GitUpdateManager(UpdateManager): ...@@ -316,7 +316,7 @@ class GitUpdateManager(UpdateManager):
gh = github.GitHub() gh = github.GitHub()
# find newest commit # find newest commit
for curCommit in gh.commits('sarakha63', 'Sick-Beard', self.branch): for curCommit in gh.commits('Adelscott', 'Sick-Beard', self.branch):
if not self._newest_commit_hash: if not self._newest_commit_hash:
self._newest_commit_hash = curCommit['sha'] self._newest_commit_hash = curCommit['sha']
if not self._cur_commit_hash: if not self._cur_commit_hash:
...@@ -344,9 +344,9 @@ class GitUpdateManager(UpdateManager): ...@@ -344,9 +344,9 @@ class GitUpdateManager(UpdateManager):
return return
if self._newest_commit_hash: if self._newest_commit_hash:
url = 'http://github.com/sarakha63/Sick-Beard/compare/'+self._cur_commit_hash+'...'+self._newest_commit_hash url = 'http://github.com/Adelscott/Sick-Beard/compare/'+self._cur_commit_hash+'...'+self._newest_commit_hash
else: else:
url = 'http://github.com/sarakha63/Sick-Beard/commits/' url = 'http://github.com/Adelscott/Sick-Beard/commits/'
new_str = 'There is a <a href="'+url+'" onclick="window.open(this.href); return false;">newer version available</a> ('+message+')' new_str = 'There is a <a href="'+url+'" onclick="window.open(this.href); return false;">newer version available</a> ('+message+')'
new_str += "&mdash; <a href=\""+self.get_update_url()+"\">UPDATE NOW</a>" new_str += "&mdash; <a href=\""+self.get_update_url()+"\">UPDATE NOW</a>"
...@@ -372,9 +372,9 @@ class GitUpdateManager(UpdateManager): ...@@ -372,9 +372,9 @@ class GitUpdateManager(UpdateManager):
Calls git pull origin <branch> in order to update Sick Beard. Returns a bool depending Calls git pull origin <branch> in order to update Sick Beard. Returns a bool depending
on the call's success. on the call's success.
""" """
self._run_git('config remote.origin.url git://github.com/sarakha63/Sick-Beard.git') self._run_git('config remote.origin.url git://github.com/Adelscott/Sick-Beard.git')
self._run_git('stash') self._run_git('stash')
output, err = self._run_git('pull git://github.com/sarakha63/Sick-Beard.git '+self.branch) #@UnusedVariable output, err = self._run_git('pull git://github.com/Adelscott/Sick-Beard.git '+self.branch) #@UnusedVariable
if not output: if not output:
return self._git_error() return self._git_error()
...@@ -452,7 +452,7 @@ class SourceUpdateManager(GitUpdateManager): ...@@ -452,7 +452,7 @@ class SourceUpdateManager(GitUpdateManager):
Downloads the latest source tarball from github and installs it over the existing version. Downloads the latest source tarball from github and installs it over the existing version.
""" """
tar_download_url = 'https://github.com/sarakha63/Sick-Beard/tarball/'+version.SICKBEARD_VERSION tar_download_url = 'https://github.com/Adelscott/Sick-Beard/tarball/'+version.SICKBEARD_VERSION
sb_update_dir = os.path.join(sickbeard.PROG_DIR, 'sb-update') sb_update_dir = os.path.join(sickbeard.PROG_DIR, 'sb-update')
version_path = os.path.join(sickbeard.PROG_DIR, 'version.txt') version_path = os.path.join(sickbeard.PROG_DIR, 'version.txt')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment