Browse Source

Working on getting update to work

environments/production/deployments/12
Drew Short 7 years ago
parent
commit
bc36365ef9
  1. 2
      .gitlab-ci.yml
  2. 6
      src/spm/spm.lua

2
.gitlab-ci.yml

@ -46,6 +46,7 @@ development:
- eval `ssh-agent -s`
- ssh-add <(echo "$SSH_DEPLOY_KEY")
- pushd ./dist
- find * -type f -exec sed -i -e 's@{ENV}@'"$ENVIRONMENT"'@g' {} \;
- find * -type f -exec sed -i -e 's@{URL_BASE}@'"$DOWNLOAD_URL_BASE"'@g' {} \;
- popd
- rsync -avz --delete-delay -e "ssh -p $DEPLOY_PORT -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" --progress dist/* $DEPLOY_USER@$DEPLOY_HOST:$TARGET_DIRECTORY
@ -70,6 +71,7 @@ production:
- eval `ssh-agent -s`
- ssh-add <(echo "$SSH_DEPLOY_KEY")
- pushd ./dist
- find * -type f -exec sed -i -e 's@{ENV}@'"$ENVIRONMENT"'@g' {} \;
- find * -type f -exec sed -i -e 's@{URL_BASE}@'"$DOWNLOAD_URL_BASE"'@g' {} \;
- popd
- rsync -avz --delete-delay -e "ssh -p $DEPLOY_PORT -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" --progress dist/* $DEPLOY_USER@$DEPLOY_HOST:$TARGET_DIRECTORY

6
src/spm/spm.lua

@ -109,7 +109,7 @@ local function readFromFile(fNum)
end
if not fs.exists(fs.path(path)) then
fs.makeDirectory(fs.path(path))
end/o
end
if not fs.exists(path) then
return { -1 }
end
@ -213,7 +213,7 @@ local function printPackages(tPacks)
end
term.clear()
local xRes, yRes = gpu.getResolution()
print("--SPM Package list--")
print("--SPM {ENV} Package list--")
local xCur, yCur = term.getCursor()
for _, j in ipairs(tPacks) do
term.write(j .. "\n")
@ -223,7 +223,7 @@ local function printPackages(tPacks)
local event = event.pull("key_down")
if event then
term.clear()
print("--SPM Package list--")
print("--SPM {ENV} Package list--")
xCur, yCur = term.getCursor()
end
end

Loading…
Cancel
Save