From 8dbe2058fb2e5717d3077dbaf890d3919405697e Mon Sep 17 00:00:00 2001 From: Millian Poquet Date: Thu, 1 Feb 2018 11:44:04 +0100 Subject: [PATCH] [#!] #!/bin/sh -> #!/usr/bin/env sh find . \ -type f \ -not -iwholename '*.git*' \ -exec sed -i -e 'sW#!\s*/bin/shW#!/usr/bin/env shWg' {} \; --- BuildSimGrid.sh | 2 +- INSTALL | 2 +- doc/doxygen/install.doc | 2 +- examples/msg/mc/bugged1_liveness_stack_cleaner | 2 +- examples/smpi/replay_multiple/generate_multiple_deployment.sh | 2 +- src/smpi/smpicc.in | 2 +- src/smpi/smpicxx.in | 2 +- src/smpi/smpif90.in | 2 +- src/smpi/smpiff.in | 2 +- src/smpi/smpirun.in | 2 +- src/smpi/smpitools.sh | 2 +- tools/doxygen/list_routing_models_examples.sh | 2 +- tools/generate-dwarf-functions | 2 +- tools/internal/travis-sonarqube.sh | 2 +- tools/jenkins/Coverage.sh | 2 +- tools/jenkins/DynamicAnalysis.sh | 2 +- tools/jenkins/DynamicAnalysis_description.sh | 2 +- tools/jenkins/Flags.sh | 2 +- tools/jenkins/Sanitizers.sh | 2 +- tools/jenkins/build.sh | 2 +- tools/stack-cleaner/c++ | 2 +- tools/stack-cleaner/cc | 2 +- tools/stack-cleaner/fortran | 2 +- tools/tesh/generate_tesh | 2 +- tools/tesh/tesh.py | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/BuildSimGrid.sh b/BuildSimGrid.sh index 5f3ce84c1f..acc87aece1 100755 --- a/BuildSimGrid.sh +++ b/BuildSimGrid.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env sh # # This little script rebuilds and runs the SimGrid archive in parallel, extracting a log # This is almost an internal script, but others may find this useful diff --git a/INSTALL b/INSTALL index 2586170844..3a17795bc8 100644 --- a/INSTALL +++ b/INSTALL @@ -196,7 +196,7 @@ cmake . \ -DGFORTRAN_EXE=/some/path/to/i686-linux-gnu-gfortran \ -DCMAKE_Fortran_FLAGS=-m32 If needed, implement i686-linux-gnu-gfortran as a script: -#!/bin/sh +#!/usr/bin/env sh exec gfortran -m32 "$@" Existing Compilation Targets diff --git a/doc/doxygen/install.doc b/doc/doxygen/install.doc index aa36cdc35e..88d880eaec 100644 --- a/doc/doxygen/install.doc +++ b/doc/doxygen/install.doc @@ -345,7 +345,7 @@ cmake . \ If needed, implement @c i686-linux-gnu-gfortran as a script: @verbatim -#!/bin/sh +#!/usr/bin/env sh exec gfortran -m32 "$@" @endverbatim diff --git a/examples/msg/mc/bugged1_liveness_stack_cleaner b/examples/msg/mc/bugged1_liveness_stack_cleaner index 09d5f663bc..cb32fc81a8 100755 --- a/examples/msg/mc/bugged1_liveness_stack_cleaner +++ b/examples/msg/mc/bugged1_liveness_stack_cleaner @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh # Run the same test compiled with -fstack-cleaner / f-no-stack-cleaner # and compare the output. diff --git a/examples/smpi/replay_multiple/generate_multiple_deployment.sh b/examples/smpi/replay_multiple/generate_multiple_deployment.sh index f267b7221a..ff73e7cf84 100755 --- a/examples/smpi/replay_multiple/generate_multiple_deployment.sh +++ b/examples/smpi/replay_multiple/generate_multiple_deployment.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env sh # Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. diff --git a/src/smpi/smpicc.in b/src/smpi/smpicc.in index a9765ac07d..85fd1eabe4 100755 --- a/src/smpi/smpicc.in +++ b/src/smpi/smpicc.in @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env sh # Copyright (c) 2007-2017. The SimGrid Team. # All rights reserved. diff --git a/src/smpi/smpicxx.in b/src/smpi/smpicxx.in index 886a8dd3f8..eb8dbe1424 100755 --- a/src/smpi/smpicxx.in +++ b/src/smpi/smpicxx.in @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env sh # Copyright (c) 2014-2017. The SimGrid Team. # All rights reserved. diff --git a/src/smpi/smpif90.in b/src/smpi/smpif90.in index 22869c30b3..56b3ac6716 100644 --- a/src/smpi/smpif90.in +++ b/src/smpi/smpif90.in @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env sh # Copyright (c) 2012-2017. The SimGrid Team. # All rights reserved. diff --git a/src/smpi/smpiff.in b/src/smpi/smpiff.in index eb28bc8f4a..42120a7198 100644 --- a/src/smpi/smpiff.in +++ b/src/smpi/smpiff.in @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env sh # Copyright (c) 2012-2017. The SimGrid Team. # All rights reserved. diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in index 3016954230..0180e230ff 100755 --- a/src/smpi/smpirun.in +++ b/src/smpi/smpirun.in @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env sh # Copyright (c) 2007-2016, The SimGrid Team. All rights reserved. diff --git a/src/smpi/smpitools.sh b/src/smpi/smpitools.sh index 40fcd3a5fc..b414eec98a 100644 --- a/src/smpi/smpitools.sh +++ b/src/smpi/smpitools.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh # Copyright (c) 2013-2017. The SimGrid Team. # All rights reserved. diff --git a/tools/doxygen/list_routing_models_examples.sh b/tools/doxygen/list_routing_models_examples.sh index 7bc3b5e512..2d5f13cbb2 100755 --- a/tools/doxygen/list_routing_models_examples.sh +++ b/tools/doxygen/list_routing_models_examples.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh cd $(dirname $0)/../../ diff --git a/tools/generate-dwarf-functions b/tools/generate-dwarf-functions index f47bec3c92..8ecc0fa42c 100755 --- a/tools/generate-dwarf-functions +++ b/tools/generate-dwarf-functions @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh # Generate files from a given dwarf.h # Usage: tools/generate-dwarf-functions /usr/include/dwarf.h diff --git a/tools/internal/travis-sonarqube.sh b/tools/internal/travis-sonarqube.sh index 922defa2a8..fc62cd1f14 100755 --- a/tools/internal/travis-sonarqube.sh +++ b/tools/internal/travis-sonarqube.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env sh # Install and run SonarQube on travis. # diff --git a/tools/jenkins/Coverage.sh b/tools/jenkins/Coverage.sh index cfe1ed1a34..2d9a332010 100755 --- a/tools/jenkins/Coverage.sh +++ b/tools/jenkins/Coverage.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh set -e diff --git a/tools/jenkins/DynamicAnalysis.sh b/tools/jenkins/DynamicAnalysis.sh index 53cbde797d..427d35f8f2 100755 --- a/tools/jenkins/DynamicAnalysis.sh +++ b/tools/jenkins/DynamicAnalysis.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh set -e diff --git a/tools/jenkins/DynamicAnalysis_description.sh b/tools/jenkins/DynamicAnalysis_description.sh index 1203441951..3e8eaf095e 100755 --- a/tools/jenkins/DynamicAnalysis_description.sh +++ b/tools/jenkins/DynamicAnalysis_description.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh set -e diff --git a/tools/jenkins/Flags.sh b/tools/jenkins/Flags.sh index 128fcc4cc0..597c14b4e0 100755 --- a/tools/jenkins/Flags.sh +++ b/tools/jenkins/Flags.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh set -e diff --git a/tools/jenkins/Sanitizers.sh b/tools/jenkins/Sanitizers.sh index 9c66b0dc7e..2c0cfa3111 100755 --- a/tools/jenkins/Sanitizers.sh +++ b/tools/jenkins/Sanitizers.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh set -e diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh index 70bd8207ec..f5b07f2928 100755 --- a/tools/jenkins/build.sh +++ b/tools/jenkins/build.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh # This script is used by various build projects on Jenkins diff --git a/tools/stack-cleaner/c++ b/tools/stack-cleaner/c++ index 51082b0971..cbd5f85ed4 100755 --- a/tools/stack-cleaner/c++ +++ b/tools/stack-cleaner/c++ @@ -1,3 +1,3 @@ -#!/bin/sh +#!/usr/bin/env sh path="$(dirname $0)" exec "$path"/compiler-wrapper c++ "$@" diff --git a/tools/stack-cleaner/cc b/tools/stack-cleaner/cc index d6da0f2a1c..fe2fe7ec7c 100755 --- a/tools/stack-cleaner/cc +++ b/tools/stack-cleaner/cc @@ -1,3 +1,3 @@ -#!/bin/sh +#!/usr/bin/env sh path="$(dirname $0)" exec "$path"/compiler-wrapper cc "$@" diff --git a/tools/stack-cleaner/fortran b/tools/stack-cleaner/fortran index 62087fddb7..f84392c233 100755 --- a/tools/stack-cleaner/fortran +++ b/tools/stack-cleaner/fortran @@ -1,3 +1,3 @@ -#!/bin/sh +#!/usr/bin/env sh path="$(dirname $0)" exec "$path"/compiler-wrapper gfortran "$@" diff --git a/tools/tesh/generate_tesh b/tools/tesh/generate_tesh index 23ec02863e..af5b032c65 100755 --- a/tools/tesh/generate_tesh +++ b/tools/tesh/generate_tesh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh # Generate a tesh file from a given command (simple case). command="$1" diff --git a/tools/tesh/tesh.py b/tools/tesh/tesh.py index 7e1f971e22..5db0dcbc0c 100755 --- a/tools/tesh/tesh.py +++ b/tools/tesh/tesh.py @@ -296,7 +296,7 @@ class Cmd(object): tesh_exit(3) except OSError as osE: if osE.errno == 8: - osE.strerror += "\nOSError: [Errno 8] Executed scripts should start with shebang line (like #!/bin/sh)" + osE.strerror += "\nOSError: [Errno 8] Executed scripts should start with shebang line (like #!/usr/bin/env sh)" raise osE cmdName = FileReader().filename+":"+str(self.linenumber) -- 2.20.1