From 2aa4cbe022f91100443a2119a46f102a35f734d0 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Fri, 1 Feb 2019 23:26:31 +0100
Subject: [PATCH] cleanup travis.sh helper

---
 moduleroot/.travis.yml.erb      |  4 +++-
 moduleroot/.travis/setup.sh.erb | 12 ------------
 2 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 moduleroot/.travis/setup.sh.erb

diff --git a/moduleroot/.travis.yml.erb b/moduleroot/.travis.yml.erb
index 07dd5061..f109b03a 100644
--- a/moduleroot/.travis.yml.erb
+++ b/moduleroot/.travis.yml.erb
@@ -21,7 +21,9 @@ addons:
   <%- end -%>
 <%- end -%>
 before_install:
-  - sh ./.travis/setup.sh
+  - gem update --system
+  - gem update bundler
+  - bundle --version
 script:
   - 'bundle exec rake $CHECK'
 matrix:
diff --git a/moduleroot/.travis/setup.sh.erb b/moduleroot/.travis/setup.sh.erb
deleted file mode 100644
index ae1a0438..00000000
--- a/moduleroot/.travis/setup.sh.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# THIS FILE IS MANAGED BY MODULESYNC
-
-rm -f Gemfile.lock
-if [ "${PUPPET_VERSION}" = '~> 4.0' ]; then
-  gem install bundler -v '< 2' --no-rdoc --no-ri;
-else
-  gem update --system;
-  gem update bundler;
-  bundle --version;
-fi