Skip to content

Commit 8479012

Browse files
committed
Merge pull request JuliaLang#16825 from JuliaLang/sb/bashisms
Use correct shebangs on .sh files
2 parents 6de9e97 + c423adf commit 8479012

File tree

6 files changed

+16
-10
lines changed

6 files changed

+16
-10
lines changed

base/version_git.sh

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/bin/sh
12
# This file is a part of Julia. License is MIT: http://julialang.org/license
23

34
# This file collects git info and create a julia file with the GIT_VERSION_INFO struct

contrib/check-whitespace.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env bash
1+
#!/bin/sh
22
# This file is a part of Julia. License is MIT: http://julialang.org/license
33

44
# Check for trailing white space in source files;

contrib/commit-name.sh

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1-
#!/bin/bash
1+
#!/bin/sh
22
# This file is a part of Julia. License is MIT: http://julialang.org/license
33

4-
last_tag=$(git describe --tags --abbrev=0)
5-
echo -n "0.4.0-dev+"
6-
git rev-list ${1-HEAD} ^$last_tag | wc -l | sed -e 's/[^[:digit:]]//g'
4+
# Need to be run from a julia repo clone
5+
# First argument (Optional) is a ref to the commit
6+
7+
gitref=${1:-HEAD}
8+
9+
last_tag=$(git describe --tags --abbrev=0 "$gitref")
10+
ver=$(git show "$gitref:VERSION")
11+
nb=$(git rev-list --count "$gitref" "^$last_tag")
12+
echo "$ver+$nb"

contrib/mac/app/run-install-name-tool-change.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ WRONG_PREFIX=$2
1111
RIGHT_PREFIX="@executable_path/../$3"
1212
ACTION=$4
1313

14-
if [ "x$ACTION" == "xchange" ]; then
14+
if [ "x$ACTION" = "xchange" ]; then
1515
libs="`otool -L $LIBRARY 2>/dev/null | fgrep compatibility | cut -d\( -f1 | grep $WRONG_PREFIX | sort | uniq`"
1616
for lib in $libs; do
1717
if ! echo $lib | grep --silent "@executable_path" ; then
1818
fixed=`echo $lib | sed -e s,\$WRONG_PREFIX,\$RIGHT_PREFIX,`
1919
install_name_tool -change $lib $fixed $LIBRARY
2020
fi
2121
done;
22-
elif [ "x$ACTION" == "xid" ]; then
22+
elif [ "x$ACTION" = "xid" ]; then
2323
lib="`otool -D $LIBRARY 2>/dev/null | grep ^$WRONG_PREFIX`"
2424
install_name_tool -id "$RIGHT_PREFIX/$lib" $LIBRARY;
2525
fi

contrib/mac/mac-gtk.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1+
#!/bin/sh
12
# This file is a part of Julia. License is MIT: http://julialang.org/license
23

3-
#/bin/sh
4-
54
# This script will attempt to download and build GTK+-3,
65
# including dependencies, in ~/gtk (also puts stuff in
76
# ~/.local, ~/Source, ~/.jhbuildrc*)

test/perf/micro/java/setup.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env bash
1+
#!/bin/sh
22
# This file is a part of Julia. License is MIT: http://julialang.org/license
33

44
mvn compile exec:java

0 commit comments

Comments
 (0)