Skip to content

Commit

Permalink
portability: use interpreters from /usr/bin/env
Browse files Browse the repository at this point in the history
  • Loading branch information
nim65s committed Jul 23, 2024
1 parent 70c929a commit fbb5e83
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 13 deletions.
9 changes: 1 addition & 8 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,9 @@ stdenv.mkDerivation {
};

prePatch = ''
substituteInPlace scripts/auto-install-hpp.sh \
--replace-fail /bin/bash ${stdenv.shell}
substituteInPlace scripts/install-tar-on-remote \
--replace-fail /bin/bash ${stdenv.shell}
substituteInPlace scripts/generate-tar-doc \
--replace-fail /bin/sh ${stdenv.shell}
substituteInPlace scripts/packageDep \
--replace-fail /usr/bin/python ${python3Packages.python.interpreter}
--replace-fail "/usr/bin/env python3" ${python3Packages.python.interpreter}
'';

strictDeps = true;

nativeBuildInputs = [
Expand Down
2 changes: 1 addition & 1 deletion scripts/auto-install-hpp.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

# Exit on error
set -e
Expand Down
2 changes: 1 addition & 1 deletion scripts/create-tags.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

set -e

Expand Down
2 changes: 1 addition & 1 deletion scripts/generate-tar-doc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/usr/bin/env bash

# generate-tar-doc $DEVEL_HPP_DIR/install/share/doc http://gepettoweb.laas.fr/hpp
# then copy /tmp/hpp.tar.gz on server and inflate archive.
Expand Down
2 changes: 1 addition & 1 deletion scripts/install-tar-on-remote
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

VERSION="v4.6.0"
HOST=gepettoweb.laas.fr
Expand Down
2 changes: 1 addition & 1 deletion scripts/packageDep
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python3

import os
import re
Expand Down

0 comments on commit fbb5e83

Please sign in to comment.