Skip to content

Commit c7e8847

Browse files
authored
Merge pull request #71 from dhduvall/solaris-fixes
Solaris fixes
2 parents 761a3d6 + 7effdc4 commit c7e8847

5 files changed

+9
-7
lines changed

combine-installers.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/bash
22
# Copyright 2014 The Rust Project Developers. See the COPYRIGHT
33
# file at the top-level directory of this distribution and at
44
# http://rust-lang.org/COPYRIGHT.

gen-install-script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/bash
22
# Copyright 2014 The Rust Project Developers. See the COPYRIGHT
33
# file at the top-level directory of this distribution and at
44
# http://rust-lang.org/COPYRIGHT.

gen-installer.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/bash
22
# Copyright 2014 The Rust Project Developers. See the COPYRIGHT
33
# file at the top-level directory of this distribution and at
44
# http://rust-lang.org/COPYRIGHT.

install-template.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/bash
22
# Copyright 2014 The Rust Project Developers. See the COPYRIGHT
33
# file at the top-level directory of this distribution and at
44
# http://rust-lang.org/COPYRIGHT.
@@ -621,9 +621,11 @@ install_components() {
621621

622622
if echo "$_file" | grep "^bin/" > /dev/null
623623
then
624-
run install -m755 "$_src_dir/$_component/$_file" "$_file_install_path"
624+
run cp "$_src_dir/$_component/$_file" "$_file_install_path"
625+
run chmod 755 "$_file_install_path"
625626
else
626-
run install -m644 "$_src_dir/$_component/$_file" "$_file_install_path"
627+
run cp "$_src_dir/$_component/$_file" "$_file_install_path"
628+
run chmod 644 "$_file_install_path"
627629
fi
628630
critical_need_ok "file creation failed"
629631

test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/bash
22

33
set -e -u
44

0 commit comments

Comments
 (0)