From c56bc953e5ea3ed3d25db41acb7b1a4bc03e8b87eba04983dc744bb7fa6c03f7 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Sat, 26 Nov 2022 11:34:27 +0000 Subject: [PATCH] Accepting request 1037935 from home:mslacken:sp removed powershell and shebangs OBS-URL: https://build.opensuse.org/request/show/1037935 OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=51 --- spack.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/spack.spec b/spack.spec index b0e7623..999e523 100644 --- a/spack.spec +++ b/spack.spec @@ -167,11 +167,8 @@ done %else cp %{S:5} lib/spack/docs/ %endif -grep -rl '#!/bin/env ' . | xargs -i@ sed -i 's|#!/bin/env|#!/usr/bin/env|g' @ - -#for file in $(find . -type f); do -# -i @ -#done +grep -rl '#! /usr/bin/env bash' . | xargs -i@ sed -i 's|#! /usr/bin/env bash|#!/usr/bin/bash|g' @ +grep -rl '#!/usr/bin/env bash' . | xargs -i@ sed -i 's|#!/usr/bin/env bash|#!/usr/bin/bash|g' @ grep -rl "spack/" . | xargs -i@ sed -i \ -e 's|$spack/opt|/opt|g' \ -e 's|$spack/var|/var/lib|g'\ @@ -264,6 +261,8 @@ rm -f share/spack/setup-tutorial-env.sh # Fix rpmlint warnings ## No need for the standalone scripts rm -f lib/spack/external/macholib/macho_*.py +## Remove non linux stuff +rm -f bin/spack.bat bin/spack_cmd.bat bin/spack_pwsh.ps1 ## Fix shebangs #sed -i 's@#!/bin/env sh@#!/bin/bash@' var/spack/repos/builtin/packages/beast-tracer/tracer #sed -i 's@#! /usr/bin/env bash@ #!/bin/bash@' share/spack/docker/entrypoint.bash