andrejus/dotfiles
1
1
Fork 0
Code Issues Activity

Update install.pl

Browse Source
This commit is contained in:
Andrejus
2020-07-12 16:53:17 +01:00
committed by GitHub
parent 5cfa5e8a0e
commit bc435cb833
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
install.pl
View File

@@ -27,7 +27,7 @@ if ($log_target ne 'STDOUT') {
# Execute given command and log appropriately # Execute given command and log appropriately
# @arg 0 command to run # @arg 0 command to run
sub execute { sub log_execute {
my $command = $log_path ne '' my $command = $log_path ne ''
? "$_[0] &> $log_path" ? "$_[0] &> $log_path"
: $_[0]; : $_[0];
@@ -37,10 +37,10 @@ sub execute {
# Ensure dependencies installed # Ensure dependencies installed
execute("sudo apt-get update -qqy && sudo apt-get install -qqy build-essential liblocal-lib-perl cpanminus stow"); log_execute("sudo apt-get update -qqy && sudo apt-get install -qqy build-essential liblocal-lib-perl cpanminus stow");
# Bootstrap files # Bootstrap files
execute("make -C $dir"); log_execute("make -C $dir");
# Read scripts to be installed # Read scripts to be installed
my $install_dir = "$dir/install"; my $install_dir = "$dir/install";
@@ -58,7 +58,7 @@ if ($target ne 'all') {
} }
foreach my $file (@files) { foreach my $file (@files) {
print "Running $file...\r"; print "Running $file...\r";
my $exit_status = execute("/bin/bash -l $install_dir/$file"); my $exit_status = log_execute("/bin/bash -l $install_dir/$file");
if ($exit_status != 0) { if ($exit_status != 0) {
print "Failure in $file, see above and logs for more detail.\n"; print "Failure in $file, see above and logs for more detail.\n";
exit ($exit_status); exit ($exit_status);