From a960be052687450ba5c0263cc216f47d409feb83 Mon Sep 17 00:00:00 2001
From: Justin Ethier <justin.ethier@gmail.com>
Date: Wed, 18 Nov 2020 10:31:03 -0500
Subject: [PATCH 1/5] Test removing sudo from travis yml

---
 .travis.yml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4ca928ef..c45825d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ matrix:
       addons:
         pkg:
           packages:
-            - sudo
+         #   - sudo
             - gmake
             - libtommath
             - concurrencykit
@@ -37,7 +37,8 @@ notifications:
 before_install:
   - |
       if [ "$(uname)" != "FreeBSD" ]; then
-        sudo ln -s /usr/bin/make /usr/bin/gmake
+        #sudo ln -s /usr/bin/make /usr/bin/gmake
+        ln -s /usr/bin/make /usr/bin/gmake
       fi
   - |
       git clone https://github.com/concurrencykit/ck.git ${HOME}/ck
@@ -45,16 +46,20 @@ before_install:
       git checkout 0.6.0
       ./configure PREFIX=/usr
       gmake all
-      sudo gmake install
+      #sudo gmake install
+      gmake install
       if [ "$(uname)" = "Linux" ]; then
-        sudo ldconfig
+        #sudo ldconfig
+        ldconfig
       fi
   - |
       git clone https://github.com/justinethier/cyclone-bootstrap.git ${HOME}/cyclone-bootstrap
       cd ${HOME}/cyclone-bootstrap
       gmake
-      sudo gmake install
+      #sudo gmake install
+      gmake install
 script:
   - gmake
-  - sudo gmake install
+  #- sudo gmake install
+  - gmake install
   - gmake test

From fb5f3c023cd4b47a9ebf6e48fb3d0e6a65efdcf9 Mon Sep 17 00:00:00 2001
From: Justin Ethier <justin.ethier@gmail.com>
Date: Wed, 18 Nov 2020 11:25:20 -0500
Subject: [PATCH 2/5] Update .travis.yml

---
 .travis.yml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c45825d7..3d7bd72f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ matrix:
       addons:
         pkg:
           packages:
-         #   - sudo
+            - sudo
             - gmake
             - libtommath
             - concurrencykit
@@ -37,8 +37,7 @@ notifications:
 before_install:
   - |
       if [ "$(uname)" != "FreeBSD" ]; then
-        #sudo ln -s /usr/bin/make /usr/bin/gmake
-        ln -s /usr/bin/make /usr/bin/gmake
+        sudo ln -s /usr/bin/make /usr/bin/gmake
       fi
   - |
       git clone https://github.com/concurrencykit/ck.git ${HOME}/ck
@@ -46,18 +45,23 @@ before_install:
       git checkout 0.6.0
       ./configure PREFIX=/usr
       gmake all
-      #sudo gmake install
-      gmake install
+      if [ "$(uname)" != "FreeBSD" ]; then
+        sudo gmake install
+      else
+        gmake install
+      fi
       if [ "$(uname)" = "Linux" ]; then
-        #sudo ldconfig
-        ldconfig
+        sudo ldconfig
       fi
   - |
       git clone https://github.com/justinethier/cyclone-bootstrap.git ${HOME}/cyclone-bootstrap
       cd ${HOME}/cyclone-bootstrap
       gmake
-      #sudo gmake install
-      gmake install
+      if [ "$(uname)" != "FreeBSD" ]; then
+        sudo gmake install
+      else
+        gmake install
+      fi
 script:
   - gmake
   #- sudo gmake install

From b8f3935cfcab15a8d7bbb324235013a522fe9e6d Mon Sep 17 00:00:00 2001
From: Justin Ethier <justin.ethier@gmail.com>
Date: Wed, 18 Nov 2020 11:41:56 -0500
Subject: [PATCH 3/5] Update .travis.yml

---
 .travis.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3d7bd72f..ce326d17 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,6 +64,11 @@ before_install:
       fi
 script:
   - gmake
-  #- sudo gmake install
+  - |
+      if [ "$(uname)" != "FreeBSD" ]; then
+        sudo gmake install
+      else
+        gmake install
+      fi
   - gmake install
   - gmake test

From 66d2527e3a84bf04d9f6dadfd9294ddaee28b0ee Mon Sep 17 00:00:00 2001
From: Justin Ethier <justin.ethier@gmail.com>
Date: Wed, 18 Nov 2020 16:21:48 -0500
Subject: [PATCH 4/5] Try to allow all platforms to finish successfully

---
 .travis.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ce326d17..97e109a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,15 +60,14 @@ before_install:
       if [ "$(uname)" != "FreeBSD" ]; then
         sudo gmake install
       else
-        gmake install
+        #gmake install
       fi
 script:
   - gmake
   - |
       if [ "$(uname)" != "FreeBSD" ]; then
         sudo gmake install
+        gmake test
       else
-        gmake install
+        # Can't do anything, TravisCI FreeBSD errors out doing sudo
       fi
-  - gmake install
-  - gmake test

From 1ee54c2d94fc795fab0fce9f2be10d2d5838a25f Mon Sep 17 00:00:00 2001
From: Justin Ethier <justin.ethier@gmail.com>
Date: Wed, 18 Nov 2020 17:41:39 -0500
Subject: [PATCH 5/5] Avoid syntax errors

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 97e109a1..8ed779da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,8 +59,8 @@ before_install:
       gmake
       if [ "$(uname)" != "FreeBSD" ]; then
         sudo gmake install
-      else
-        #gmake install
+      # else
+      # #gmake install
       fi
 script:
   - gmake
@@ -68,6 +68,6 @@ script:
       if [ "$(uname)" != "FreeBSD" ]; then
         sudo gmake install
         gmake test
-      else
-        # Can't do anything, TravisCI FreeBSD errors out doing sudo
+      # else
+      #  # Can't do anything, TravisCI FreeBSD errors out doing sudo
       fi