VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-07-29 11:50:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix to drop dependency from Term::ANSIColor

Browse Source
This commit is contained in:
Ilia Ross
2024-06-30 11:41:41 +03:00
parent 248cb719c0
commit 7507433bf1
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bin/patch
View File

@ -8,7 +8,6 @@ use 5.010;
use Getopt::Long qw(:config permute pass_through); use Getopt::Long qw(:config permute pass_through);
use Pod::Usage; use Pod::Usage;
use Term::ANSIColor qw(:constants);
use File::Basename; use File::Basename;
use Cwd qw(cwd); use Cwd qw(cwd);
@ -38,13 +37,13 @@ init_config();
# Check if curl is installed # Check if curl is installed
if (!has_command('curl')) { if (!has_command('curl')) {
print RED, "curl is not installed\n", RESET; print "curl is not installed\n";
exit 1; exit 1;
} }
# Check if git is installed # Check if git is installed
if (!has_command('git')) { if (!has_command('git')) {
print RED, "git is not installed\n", RESET; print "git is not installed\n";
exit 1; exit 1;
} }
@ -60,7 +59,7 @@ if (!$patch) {
# Patch check # Patch check
if ($patch !~ /^https?:\/\//) { if ($patch !~ /^https?:\/\//) {
if (!-r $patch) { if (!-r $patch) {
print RED, "Patch file $patch doesn't exist\n", RESET; print "Patch file $patch doesn't exist\n";
exit 1; exit 1;
} }
} }
@ -83,7 +82,7 @@ if ($patch =~ m{https://(github|gitlab)\.com/[^/]+/([^/]+)/commit/[^/]+}) {
# Check if module exists # Check if module exists
if (!-d "$path/$module") { if (!-d "$path/$module") {
print RED, "Module $module doesn't exist\n", RESET; print "Module $module doesn't exist\n";
exit 1; exit 1;
} }
@ -100,7 +99,7 @@ else {
# Apply patch using Git # Apply patch using Git
my $output = `$cmd 2>&1 | git apply --reject --verbose --whitespace=fix 2>&1`; my $output = `$cmd 2>&1 | git apply --reject --verbose --whitespace=fix 2>&1`;
if ($output !~ /applied patch.*?cleanly/i) { if ($output !~ /applied patch.*?cleanly/i) {
print YELLOW, "Patch failed: $output\n", RESET; print "Patch failed: $output\n";
exit 1; exit 1;
} }
print "Patch applied successfully to:\n"; print "Patch applied successfully to:\n";