aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alex@karatarakis.com>2018-04-25 13:28:53 -0700
committerGitHub <noreply@github.com>2018-04-25 13:28:53 -0700
commit90be0d9b67cfe8d86f31a5303c98365291de17bb (patch)
treea30a323ba6ee13a4df50d70226b938d58b28a3a1
parent06365f9293bd70a413b001632130e1236da6755b (diff)
parent237268f29d90c270f9955eb86cc5471bbb47d22a (diff)
downloadvcpkg-90be0d9b67cfe8d86f31a5303c98365291de17bb.tar.gz
vcpkg-90be0d9b67cfe8d86f31a5303c98365291de17bb.zip
Merge pull request #3313 from jhasse/patch-1
Add sh shebang to bootstrap script
-rw-r--r--[-rwxr-xr-x]bootstrap-vcpkg.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/bootstrap-vcpkg.sh b/bootstrap-vcpkg.sh
index 4bfb17308..7196fbde0 100755..100644
--- a/bootstrap-vcpkg.sh
+++ b/bootstrap-vcpkg.sh
@@ -1,2 +1,8 @@
+<<<<<<< Updated upstream
+#!/usr/bin/env bash
+=======
+#!/bin/sh
+>>>>>>> Stashed changes
+
vcpkgRootDir=$(X= cd -- "$(dirname -- "$0")" && pwd -P)
-$vcpkgRootDir/scripts/bootstrap.sh \ No newline at end of file
+$vcpkgRootDir/scripts/bootstrap.sh