Skip to content

Commit

Permalink
RE-113: Stop using the --noscripts flag to rpm -e on wp-toolkit-cpanel
Browse files Browse the repository at this point in the history
Apparently this is no longer required.

Changelog: Stop using the --noscripts flag when erasing wp-toolkit-cpanel
  in pre-leapp stage.
  • Loading branch information
troglodyne committed Jul 26, 2024
1 parent 2ef7a18 commit 12b2ced
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions elevate-cpanel
Original file line number Diff line number Diff line change
Expand Up @@ -5316,11 +5316,11 @@ EOS

INFO("Removing Wordpress Toolkit");

INFO("Removing the rpm wp-toolkit-cpanel (--noscripts)");
INFO("Removing the rpm wp-toolkit-cpanel");
backup_3rdparty_file('/usr/local/cpanel/3rdparty/wp-toolkit/var/wp-toolkit.sqlite3');
backup_3rdparty_file('/usr/local/cpanel/3rdparty/wp-toolkit/var/etc/.shadow');

my ($output) = Cpanel::SafeRun::Errors::saferunallerrors(qw{/usr/bin/rpm -e --noscripts wp-toolkit-cpanel});
my ($output) = Cpanel::SafeRun::Errors::saferunallerrors(qw{/usr/bin/rpm -e wp-toolkit-cpanel});
DEBUG($output) if $output;

cpev::yum_list(1); # Invalidate the cache since we just ran an rpm -e by hand.
Expand Down
4 changes: 2 additions & 2 deletions lib/Elevate/Components/WPToolkit.pm
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ sub _remove_wordpress_toolkit ($self) {

INFO("Removing Wordpress Toolkit");

INFO("Removing the rpm wp-toolkit-cpanel (--noscripts)");
INFO("Removing the rpm wp-toolkit-cpanel");
backup_3rdparty_file('/usr/local/cpanel/3rdparty/wp-toolkit/var/wp-toolkit.sqlite3');
backup_3rdparty_file('/usr/local/cpanel/3rdparty/wp-toolkit/var/etc/.shadow');

my ($output) = Cpanel::SafeRun::Errors::saferunallerrors(qw{/usr/bin/rpm -e --noscripts wp-toolkit-cpanel});
my ($output) = Cpanel::SafeRun::Errors::saferunallerrors(qw{/usr/bin/rpm -e wp-toolkit-cpanel});
DEBUG($output) if $output;

cpev::yum_list(1); # Invalidate the cache since we just ran an rpm -e by hand.
Expand Down

0 comments on commit 12b2ced

Please sign in to comment.