From 744cf727f0102fc51dde5a2f0269433138270448 Mon Sep 17 00:00:00 2001
From: nnoodle <nnoodle@chiru.no>
Date: Thu, 11 Apr 2019 22:25:40 +0700
Subject: Use /bin/sh and exit immediately if a command fails.

---
 scripts/configure_ubuntu.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'scripts/configure_ubuntu.sh')

diff --git a/scripts/configure_ubuntu.sh b/scripts/configure_ubuntu.sh
index 3817997c..848cf63e 100755
--- a/scripts/configure_ubuntu.sh
+++ b/scripts/configure_ubuntu.sh
@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/bin/sh
+set -e
 
 #assumes a somewhat recent 64-bit ubuntu
 
-- 
cgit 


From f2a4ac013dd0cd1b054a8fa604bc75a659cff3ff Mon Sep 17 00:00:00 2001
From: David Skoland <davidskoland@gmail.com>
Date: Sat, 29 Jun 2019 00:27:31 +0000
Subject: Mac improvements

Just modifying build scripts to make it less painful to build and release on Mac

See merge request AttorneyOnline/AO2-Client!64
---
 scripts/configure_ubuntu.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'scripts/configure_ubuntu.sh')

diff --git a/scripts/configure_ubuntu.sh b/scripts/configure_ubuntu.sh
index 848cf63e..159dc4d1 100755
--- a/scripts/configure_ubuntu.sh
+++ b/scripts/configure_ubuntu.sh
@@ -1,7 +1,13 @@
 #!/bin/sh
-set -e
 
-#assumes a somewhat recent 64-bit ubuntu
+# Assumes a somewhat recent 64-bit ubuntu
+
+# Exit on errors and unset variables
+set -eu
+
+ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/"
+
+cd ${ROOT_DIR}
 
 #need some openGL stuff
 sudo apt install libgl1-mesa-dev
-- 
cgit 


From 16947224a2ced1d1a8767996388feb9ad2a46ebd Mon Sep 17 00:00:00 2001
From: windrammer <31085911+likeawindrammer@users.noreply.github.com>
Date: Sat, 20 Jul 2019 16:13:52 -0600
Subject: Change the shebang of configure_ubuntu.sh from sh to bash because the
 script it's using the bash only variable BASH_SOURCE

---
 scripts/configure_ubuntu.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/configure_ubuntu.sh')

diff --git a/scripts/configure_ubuntu.sh b/scripts/configure_ubuntu.sh
index 159dc4d1..1f9b8e83 100755
--- a/scripts/configure_ubuntu.sh
+++ b/scripts/configure_ubuntu.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Assumes a somewhat recent 64-bit ubuntu
 
-- 
cgit 


From abff73de3c103b1a608b66fbf56687453bcc63f5 Mon Sep 17 00:00:00 2001
From: cents02 <46689260+cents02@users.noreply.github.com>
Date: Mon, 29 Jul 2019 08:11:14 -0700
Subject: Ubuntu config gets curl too

Config now gets curl incase of fresh vm.
---
 scripts/configure_ubuntu.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'scripts/configure_ubuntu.sh')

diff --git a/scripts/configure_ubuntu.sh b/scripts/configure_ubuntu.sh
index 1f9b8e83..5437dc10 100755
--- a/scripts/configure_ubuntu.sh
+++ b/scripts/configure_ubuntu.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+....#!/bin/bash
 
 # Assumes a somewhat recent 64-bit ubuntu
 
@@ -11,7 +11,8 @@ cd ${ROOT_DIR}
 
 #need some openGL stuff
 sudo apt install libgl1-mesa-dev
-
+#install curl incase of fresh vm
+sudo apt install curl
 mkdir tmp
 
 cd tmp
-- 
cgit 


From 326425f54b4115108e5b556c3fcf64663c467618 Mon Sep 17 00:00:00 2001
From: cents02 <46689260+cents02@users.noreply.github.com>
Date: Mon, 29 Jul 2019 08:14:51 -0700
Subject: Update configure_ubuntu.sh

---
 scripts/configure_ubuntu.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/configure_ubuntu.sh')

diff --git a/scripts/configure_ubuntu.sh b/scripts/configure_ubuntu.sh
index 5437dc10..6cad1f15 100755
--- a/scripts/configure_ubuntu.sh
+++ b/scripts/configure_ubuntu.sh
@@ -1,4 +1,4 @@
-....#!/bin/bash
+#!/bin/bash
 
 # Assumes a somewhat recent 64-bit ubuntu
 
-- 
cgit 


From c8b219136e1632c83323567acd38e0be590f5d7a Mon Sep 17 00:00:00 2001
From: windrammer <31085911+likeawindrammer@users.noreply.github.com>
Date: Mon, 5 Aug 2019 08:40:54 -0600
Subject: Add double quotes around ${ROOT_DIR} (#91)

Without this the script fails with ./configure_ubuntu.sh: line 10: cd: too many arguments if there's any space in the patch of the root folder
---
 scripts/configure_ubuntu.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/configure_ubuntu.sh')

diff --git a/scripts/configure_ubuntu.sh b/scripts/configure_ubuntu.sh
index 6cad1f15..a3d07ede 100755
--- a/scripts/configure_ubuntu.sh
+++ b/scripts/configure_ubuntu.sh
@@ -7,7 +7,7 @@ set -eu
 
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/"
 
-cd ${ROOT_DIR}
+cd "${ROOT_DIR}"
 
 #need some openGL stuff
 sudo apt install libgl1-mesa-dev
-- 
cgit