From 38a7bbf698154fa5effad4b55ff21f3fc7d61780 Mon Sep 17 00:00:00 2001
From: Drew Short <warrick@sothr.com>
Date: Thu, 18 Jan 2018 15:58:14 -0600
Subject: [PATCH] Moving domains

---
 .gitlab-ci.yml   |  8 ++++----
 src/spm/spm.moon | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58d87f3..64e74b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,8 +38,8 @@ development:
     DEPLOY_HOST: "sothr.com"
     DEPLOY_PORT: "9140"
     ENVIRONMENT: "Development"
-    TARGET_DIRECTORY: "~/download_dir/oc/development"
-    DOWNLOAD_URL_BASE: "https://sothr.com/download/oc/development"
+    TARGET_DIRECTORY: "~/opencomputers.sothr.com/development"
+    DOWNLOAD_URL_BASE: "https://opencomputers.sothr.com/development"
     MINIFIED_SOURCE: "false"
   script:
     - echo "Deployment To Development Starting..."
@@ -65,8 +65,8 @@ production:
     DEPLOY_HOST: "sothr.com"
     DEPLOY_PORT: "9140"
     ENVIRONMENT: "Release"
-    TARGET_DIRECTORY: "~/download_dir/oc/release"
-    DOWNLOAD_URL_BASE: "https://sothr.com/download/oc/release"
+    TARGET_DIRECTORY: "~/opencomputers.sothr.com/release"
+    DOWNLOAD_URL_BASE: "https://https://opencomputers.sothr.com/release"
     MINIFIED_SOURCE: "true"
   script:
     - echo "Deployment To Production Starting..."
diff --git a/src/spm/spm.moon b/src/spm/spm.moon
index 7c497dc..c1e8563 100644
--- a/src/spm/spm.moon
+++ b/src/spm/spm.moon
@@ -39,26 +39,26 @@ printUsage = ->
 
 -- Make an internet http/s request for data
 getContent = (url) ->
-    sContent = ""
+    content = ""
     result, response = pcall(internet.request, url)
 
     if not result 
         return nil
 
     for chunk in response
-        sContent = sContent .. chunk
+        content = content .. chunk
 
-    return sContent
+    return content
 
 -- Request repository information
-getRepos = ->
-    success, sRepos = pcall(getContent, repoLocationConfig)
+getRepositories = ->
+    success, raw_repositories = pcall(getContent, repoLocationConfig)
 
     if not success 
         io.stderr\write("Could not connect to the Internet. Please ensure you have an Internet connection.")
         return -1
 
-    return serial.unserialize(sRepos)
+    return serial.unserialize(raw_repositories)
 
 -- Get Packages for src
 getPackages = (src) ->
@@ -136,7 +136,7 @@ listPackages = (filter) ->
     packageTable = {}
     print("Receiving Package list...")
     if not options.i 
-        success, repositories = pcall(getRepos)
+        success, repositories = pcall(getRepositories)
 
         if not success or repositories == -1 
             io.stderr\write("Unable to connect to the Internet.\n")
@@ -205,7 +205,7 @@ printPackages = (packages) ->
                 xCur, yCur = term.getCursor()
 
 getInformation = (requestedPackage) ->
-    success, repositories = pcall(getRepos)
+    success, repositories = pcall(getRepositories)
 
     if not success or repositories == -1 
         io.stderr\write("Unable to connect to the Internet.\n")