tyler.durden
/
auto-cpufreq
mirror of https://github.com/AdnanHodzic/auto-cpufreq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for auto-cpufreq-installer regression in #460 (#462) 

* Added an error message when the file isn't found

* $srv_install and $srv_remove are now at new locations
Created _old variables to keep track of old locations

* Added exit statement and specified daemon not removed

* Fixed some errors
This commit is contained in:
abvee 2022-11-30 11:58:49 +05:30 committed by GitHub
parent 70c58fba3a
commit 13edca0a61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
auto-cpufreq-installer
View File

@ -163,14 +163,22 @@ fi
function tool_remove { function tool_remove {
files="files.txt" files="files.txt"
share_dir="/usr/local/share/auto-cpufreq/" share_dir="/usr/local/share/auto-cpufreq/"
srv_install="/usr/bin/auto-cpufreq-install"
srv_remove="/usr/bin/auto-cpufreq-remove" srv_install="/usr/local/bin/auto-cpufreq-install"
srv_install_old="/usr/bin/auto-cpufreq-install"
srv_remove="/usr/local/bin/auto-cpufreq-remove"
srv_remove_old="/usr/bin/auto-cpufreq-remove"
stats_file="/var/run/auto-cpufreq.stats" stats_file="/var/run/auto-cpufreq.stats"
tool_proc_rm="/usr/local/bin/auto-cpufreq --remove" tool_proc_rm="/usr/local/bin/auto-cpufreq --remove"
wrapper_script="/usr/local/bin/auto-cpufreq" wrapper_script="/usr/local/bin/auto-cpufreq"
unit_file="/etc/systemd/system/auto-cpufreq.service" unit_file="/etc/systemd/system/auto-cpufreq.service"
venv_path="/opt/auto-cpufreq" venv_path="/opt/auto-cpufreq"
cpufreqctl="/usr/bin/cpufreqctl.auto-cpufreq"
cpufreqctl="/usr/local/bin/cpufreqctl.auto-cpufreq"
cpufreqctl_old="/usr/bin/cpufreqctl.auto-cpufreq"
# stop any running auto-cpufreq argument (daemon/live/monitor) # stop any running auto-cpufreq argument (daemon/live/monitor)
tool_arg_pids=($(pgrep -f "auto-cpufreq --")) tool_arg_pids=($(pgrep -f "auto-cpufreq --"))
@ -181,8 +189,13 @@ function tool_remove {
done done
# run uninstall in case of installed daemon # run uninstall in case of installed daemon
if [ -f $srv_remove ]; then if [ -f $srv_remove -o -f $srv_remove_old ]; then
eval $tool_proc_rm eval $tool_proc_rm
else
separator
printf "Couldn't remove the auto-cpufreq daemon\n$srv_remove or $srv_remove_old do not exist.\n"
exit 1;
separator
fi fi
# remove auto-cpufreq and all its supporting files # remove auto-cpufreq and all its supporting files
@ -191,11 +204,17 @@ function tool_remove {
# files cleanup # files cleanup
[ -f $srv_install ] && rm $srv_install [ -f $srv_install ] && rm $srv_install
[ -f $srv_install_old ] && rm $srv_install_old
[ -f $srv_remove ] && rm $srv_remove [ -f $srv_remove ] && rm $srv_remove
[ -f $srv_remove_old ] && rm $srv_remove_old
[ -f $stats_file ] && rm $stats_file [ -f $stats_file ] && rm $stats_file
[ -f $unit_file ] && rm $unit_file [ -f $unit_file ] && rm $unit_file
[ -f $wrapper_script ] && rm $wrapper_script [ -f $wrapper_script ] && rm $wrapper_script
[ -f $cpufreqctl ] && rm $cpufreqctl [ -f $cpufreqctl ] && rm $cpufreqctl
[ -f $cpufreqctl_old ] && rm $cpufreqctl_old
# remove python virtual environment # remove python virtual environment
rm -rf "${venv_path}" rm -rf "${venv_path}"