From 7c293a78734b6e675aa922f41c38f73efe969aae Mon Sep 17 00:00:00 2001
From: Jeremy Edwards <jeremyje@gmail.com>
Date: Thu, 3 Dec 2015 16:12:21 -0800
Subject: New image links, moved images to a dedicated Cloud Storage bucket,
 cleanup.

---
 README.md     | 13 +++++++------
 aurinstall.sh |  2 +-
 push.sh       |  5 ++---
 utils.py      | 23 +----------------------
 4 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/README.md b/README.md
index c9be8fb..bc45dcf 100644
--- a/README.md
+++ b/README.md
@@ -9,9 +9,10 @@ The image is configured close to the recommendations listed on
 These scripts are written in Python3.
 
 ## Prebuilt Images
-
- * arch-v20151023 - [gs://jeremyje/archlinux-images/arch-v20151023.tar.gz](https://storage.googleapis.com/jeremyje/archlinux-images/arch-v20151023.tar.gz)
- * arch-v20150903 - [gs://jeremyje/archlinux-images/arch-v20150903.tar.gz](https://storage.googleapis.com/jeremyje/archlinux-images/arch-v20150903.tar.gz)
+ * arch-v20151203 - [gs://gce-arch-images/arch-v20151203.tar.gz](https://storage.googleapis.com/gce-arch-images/arch-v20151203.tar.gz)
+ * arch-v20151103 - [gs://gce-arch-images/arch-v20151103.tar.gz](https://storage.googleapis.com/gce-arch-images/arch-v20151103.tar.gz)
+ * arch-v20151023 - [gs://gce-arch-images/arch-v20151023.tar.gz](https://storage.googleapis.com/gce-arch-images/arch-v20151023.tar.gz)
+ * arch-v20150903 - [gs://gce-arch-images/arch-v20150903.tar.gz](https://storage.googleapis.com/gce-arch-images/arch-v20150903.tar.gz)
 
 You can add these images using the
 [Developers Console](https://console.developers.google.com/compute/imagesAdd).
@@ -20,9 +21,9 @@ You can use [Cloud SDK](https://cloud.google.com/sdk/) to add the prebuilt
 images to your project. To do that run the following command.
 
 ```
-gcloud compute images insert arch-v20151023 \
-  --source-uri gs://jeremyje/archlinux-images/arch-v20151023.tar.gz \
-  --description "Arch Linux built on 2015-10-23"
+gcloud compute images insert arch-v20151203 \
+  --source-uri gs://jeremyje/archlinux-images/arch-v20151203.tar.gz \
+  --description "Arch Linux built on 2015-12-03"
 ```
 
 ## Usage
diff --git a/aurinstall.sh b/aurinstall.sh
index d8582c6..22656ae 100755
--- a/aurinstall.sh
+++ b/aurinstall.sh
@@ -15,4 +15,4 @@ InstallFromAur() {
 for package in "$@"
 do
   InstallFromAur "${package}"
-done
\ No newline at end of file
+done
diff --git a/push.sh b/push.sh
index 7faa2dc..1441a29 100755
--- a/push.sh
+++ b/push.sh
@@ -1,11 +1,10 @@
 #!/bin/bash
 
-
 VM_USER="${USER}"
 PACKAGE_FILE="archbuilder.tar.gz"
 INSTANCE_NAME="instance-1"
 ZONE="us-east1-d"
-ARCH_DATE="20151023"
+ARCH_DATE="20151203"
 SSH_TARGET=${VM_USER}@${INSTANCE_NAME}
 
 rm -f ${PACKAGE_FILE}
@@ -14,4 +13,4 @@ gcloud compute ssh ${SSH_TARGET} --command "rm -fr *" --zone=${ZONE}
 gcloud compute copy-files ${PACKAGE_FILE} ${SSH_TARGET}:/home/${VM_USER} --zone=${ZONE}
 
 gcloud compute ssh ${SSH_TARGET} --command "tar xvzf ${PACKAGE_FILE}; rm ${PACKAGE_FILE}; chmod +x *.sh" --zone=${ZONE}
-gcloud compute ssh ${SSH_TARGET} --command "sudo ./build-gce-arch.py --verbose --size_gb=100 --debug --public --upload gs://jeremyje/archlinux-images/arch-v${ARCH_DATE}.tar.gz --register" --zone=${ZONE}
+gcloud compute ssh ${SSH_TARGET} --command "sudo ./build-gce-arch.py --verbose --size_gb=100 --debug --public --upload gs://gce-arch-images/unverified/arch-v${ARCH_DATE}.tar.gz --register" --zone=${ZONE}
diff --git a/utils.py b/utils.py
index 76156fd..3ed8082 100644
--- a/utils.py
+++ b/utils.py
@@ -80,25 +80,6 @@ def UserExists(username):
     return False
 
 
-def CreateBuildUser(user=BUILDER_USER):
-  if user == BUILDER_USER:
-    logging.warning('Skipping create user.')
-    return
-  if not UserExists(user):
-    home_dir = '/home/%s' % user
-    Run(['useradd', user, '-d', home_dir])
-    Run(['mkdir', home_dir])
-    Run(['chown', '%s:%s' % (user, user), home_dir])
-
-
-def RemoveBuildUser():
-  if True:
-    logging.warning('Skipping delete user.')
-    return
-  if UserExists(BUILDER_USER):
-    Run(['userdel', '-r', BUILDER_USER])
-
-
 def Run(params, cwd=None, capture_output=False, shell=False, env=None, wait=True):
   try:
     logging.debug('Run: %s in %s', params, cwd)
@@ -268,7 +249,6 @@ def ChangeDirectoryOwner(username, directory):
 
 
 def AurInstall(name=None, pkbuild_url=None):
-  CreateBuildUser()
   if name:
     pkbuild_url = 'https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=%s' % (name.lower())
   workspace_dir = CreateTempDirectory()
@@ -278,8 +258,7 @@ def AurInstall(name=None, pkbuild_url=None):
   tarball = glob.glob(os.path.join(workspace_dir, '*.tar*'))
   tarball = tarball[0]
   Pacman(['-U', tarball], cwd=workspace_dir)
-  
-  RemoveBuildUser()
+
   return tarball
 
 
-- 
cgit v1.3