From a7eb0ed8b28b4cc93db9f0ac4fa730298bf9b19e Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Wed, 12 Aug 2015 01:29:32 -0700
Subject: [PATCH] Make our URL settings more flexible.

---
 Gruntfile.coffee                        | 2 --
 package.json                            | 6 +++---
 src/General/Main.coffee                 | 2 +-
 src/General/html/Settings/Settings.html | 4 ++--
 src/General/meta/metadata.js            | 2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index 73a744ae9..1a9de374b 100755
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -173,8 +173,6 @@ module.exports = (grunt) ->
         stdout: true
         stderr: true
         failOnError: true
-      checkout:
-        command: 'git checkout <%= pkg.meta.mainBranch %>'
       commit:
         command: """
           git commit -am "Release <%= pkg.meta.name %> v<%= pkg.meta.version %>."
diff --git a/package.json b/package.json
index a2bee3a46..6897cc940 100644
--- a/package.json
+++ b/package.json
@@ -5,18 +5,18 @@
     "name": "4chan X",
     "version": "1.11.8.4",
     "date": "2015-08-11T05:15:18.264Z",
-    "repo": "https://github.com/ccd0/4chan-x/",
     "page": "https://github.com/ccd0/4chan-x",
     "downloads": "https://ccd0.github.io/4chan-x/builds/",
     "oldVersions": "https://raw.githubusercontent.com/ccd0/4chan-x/",
     "faq": "https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions",
+    "license": "https://github.com/ccd0/4chan-x/blob/master/LICENSE",
+    "changelog": "https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md",
+    "issues": "https://github.com/ccd0/4chan-x/issues",
     "appid": "lacclbnghgdicfifcamcmcnilckjamag",
     "chromeStoreID": "ohnjgmpcibpbafdlkimncjhflgedgpam",
     "recaptchaKey": "6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc",
     "youtubeAPIKey": "AIzaSyB5_zaen_-46Uhz1xGR-lz1YoUMHqCD6CE",
     "awsBucket": "4chan-x",
-    "buildsPath": "builds/",
-    "mainBranch": "master",
     "matches": [
       "*://boards.4chan.org/*",
       "*://sys.4chan.org/*",
diff --git a/src/General/Main.coffee b/src/General/Main.coffee
index 54a5eb533..a39f72e4b 100755
--- a/src/General/Main.coffee
+++ b/src/General/Main.coffee
@@ -100,7 +100,7 @@ Main =
     $.set items2, ->
       if items['Show Updated Notifications'] ? true
         el = $.el 'span',
-          <%= html(meta.name + ' has been updated to <a href="' + meta.repo + 'blob/' + meta.mainBranch + '/CHANGELOG.md" target="_blank">version ${g.VERSION}</a>.') %>
+          <%= html(meta.name + ' has been updated to <a href="' + meta.changelog + '" target="_blank">version ${g.VERSION}</a>.') %>
         new Notice 'info', el, 15
 
   initFeatures: ->
diff --git a/src/General/html/Settings/Settings.html b/src/General/html/Settings/Settings.html
index 71f37b68b..1f6d5f996 100755
--- a/src/General/html/Settings/Settings.html
+++ b/src/General/html/Settings/Settings.html
@@ -7,8 +7,8 @@
       <a class="reset">Reset Settings</a>&nbsp|&nbsp
       <input type="file" hidden>
     <a href="<%= meta.page %>" target="_blank"><%= meta.name %></a>&nbsp|&nbsp
-    <a href="<%= meta.repo %>blob/<%= meta.mainBranch %>/CHANGELOG.md" target="_blank">${g.VERSION}</a>&nbsp|&nbsp
-    <a href="<%= meta.repo %>issues" target="_blank">Issues</a>&nbsp|&nbsp
+    <a href="<%= meta.changelog %>" target="_blank">${g.VERSION}</a>&nbsp|&nbsp
+    <a href="<%= meta.issues %>" target="_blank">Issues</a>&nbsp|&nbsp
     <a href="javascript:;" class="close fa fa-times" title="Close"></a>
   </div>
 </nav>
diff --git a/src/General/meta/metadata.js b/src/General/meta/metadata.js
index 584249cd9..b94334d47 100755
--- a/src/General/meta/metadata.js
+++ b/src/General/meta/metadata.js
@@ -5,7 +5,7 @@
 // @minFFVer     <%= meta.min.firefox %>
 // @namespace    <%= name %>
 // @description  <%= description %>
-// @license      MIT; <%= meta.repo %>blob/<%= meta.mainBranch %>/LICENSE 
+// @license      MIT; <%= meta.license %> 
 <%=
   meta.matches.map(function(match) {
     if (/^\*/.test(match)) {