Skip to content

Commit

Permalink
auto-cpufreq: 2.3.0 -> 2.4.0 (#339771)
Browse files Browse the repository at this point in the history
  • Loading branch information
@minijackson
minijackson authored Sep 8, 2024
2 parents 99551fc + e2f3761 commit e293846
Show file tree
Hide file tree
Showing 4 changed files with 120 additions and 170 deletions.
39 changes: 13 additions & 26 deletions pkgs/by-name/au/auto-cpufreq/fix-version-output.patch
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,20 @@
diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py
index 58cedb7..89e77a4 100755
--- a/auto_cpufreq/core.py
+++ b/auto_cpufreq/core.py
@@ -136,26 +136,8 @@ except PermissionError:

diff --git c/auto_cpufreq/core.py i/auto_cpufreq/core.py
index b51d55d..b0bff1e 100755
--- c/auto_cpufreq/core.py
+++ i/auto_cpufreq/core.py
@@ -96,13 +96,8 @@ except PermissionError:
# display running version of auto-cpufreq
def app_version():
-
- print("auto-cpufreq version: ", end="")
-
- # snap package
- if os.getenv("PKG_MARKER") == "SNAP":
- print(getoutput(r"echo \(Snap\) $SNAP_VERSION"))
- # aur package
- elif dist_name in ["arch", "manjaro", "garuda"]:
- aur_pkg_check = call("pacman -Qs auto-cpufreq > /dev/null", shell=True)
- if aur_pkg_check == 1:
- print(get_formatted_version())
- else:
- print(getoutput("pacman -Qi auto-cpufreq | grep Version"))
- if IS_INSTALLED_WITH_SNAP: print(getoutput(r"echo \(Snap\) $SNAP_VERSION"))
- elif IS_INSTALLED_WITH_AUR: print(getoutput("pacman -Qi auto-cpufreq | grep Version"))
- else:
- # source code (auto-cpufreq-installer)
- try:
- print(get_formatted_version())
- except Exception as e:
- print(repr(e))
- pass
+ print("auto-cpufreq version: @version@")
+ print("Git commit: v@version@")

- try: print(get_formatted_version())
- except Exception as e: print(repr(e))
+ print("auto-cpufreq version: @version@")
+ print("Git commit: v@version@")

def check_for_update():
# returns True if a new release is available from the GitHub repo
6 changes: 3 additions & 3 deletions pkgs/by-name/au/auto-cpufreq/package.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
}:
python3Packages.buildPythonPackage rec {
pname = "auto-cpufreq";
version = "2.3.0";
version = "2.4.0";
format = "pyproject";

src = fetchFromGitHub {
owner = "AdnanHodzic";
repo = "auto-cpufreq";
rev = "v${version}";
hash = "sha256-Bet/WOVveLIA+0Mvly4AsielR+r/AJXIgHdWrtc7i/U=";
rev = "refs/tags/v${version}";
hash = "sha256-Xsh3d7rQY7RKzZ7J0swrgxZEyITb7B3oX5F/tcBGjfk=";
};

nativeBuildInputs = [
Expand Down
120 changes: 50 additions & 70 deletions pkgs/by-name/au/auto-cpufreq/prevent-install-and-copy.patch
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,35 @@
diff --git a/auto_cpufreq/bin/auto_cpufreq.py b/auto_cpufreq/bin/auto_cpufreq.py
index 4343b8d..dc286f6 100755
--- a/auto_cpufreq/bin/auto_cpufreq.py
+++ b/auto_cpufreq/bin/auto_cpufreq.py
@@ -199,41 +199,9 @@ def main(config, daemon, debug, update, install, remove, live, log, monitor, sta
print("https://github.com/AdnanHodzic/auto-cpufreq/#donate")
footer()
diff --git c/auto_cpufreq/bin/auto_cpufreq.py i/auto_cpufreq/bin/auto_cpufreq.py
index 7192366..96289e1 100755
--- c/auto_cpufreq/bin/auto_cpufreq.py
+++ i/auto_cpufreq/bin/auto_cpufreq.py
@@ -134,20 +134,7 @@ def main(monitor, live, daemon, install, update, remove, force, config, stats, g
except KeyboardInterrupt: break
conf.notifier.stop()
elif install:
- if os.getenv("PKG_MARKER") == "SNAP":
- root_check()
- root_check()
- if IS_INSTALLED_WITH_SNAP:
- running_daemon_check()
- gnome_power_detect_snap()
- tlp_service_detect_snap()
- bluetooth_notif_snap()
- gov_check()
- run("snapctl set daemon=enabled", shell=True)
- run("snapctl start --enable auto-cpufreq", shell=True)
- deploy_complete_msg()
- else:
- root_check()
- running_daemon_check()
- gov_check()
- deploy_daemon()
- deploy_complete_msg()
- deploy_complete_msg()
+ print("install is disabled in the nix package")
elif update:
root_check()
custom_dir = "/opt/auto-cpufreq/source"
@@ -185,21 +172,7 @@ def main(monitor, live, daemon, install, update, remove, force, config, stats, g
run(["auto-cpufreq", "--version"])
else: print("Aborted")
elif remove:
- if os.getenv("PKG_MARKER") == "SNAP":
- root_check()
- root_check()
- if IS_INSTALLED_WITH_SNAP:
- run("snapctl set daemon=disabled", shell=True)
- run("snapctl stop --disable auto-cpufreq", shell=True)
- if auto_cpufreq_stats_path.exists():
Expand All @@ -37,101 +41,81 @@ index 4343b8d..dc286f6 100755
- # {the following snippet also used in --update, update it there too(if required)}
- # * undo bluetooth boot disable
- gnome_power_rm_reminder_snap()
- remove_complete_msg()
- else:
- root_check()
- remove_daemon()
- remove_complete_msg()
- else: remove_daemon()
- remove_complete_msg()
+ print("remove is disabled in the nix package")
elif update:
root_check()
custom_dir = "/opt/auto-cpufreq/source"
diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py
index 58cedb7..c50b0e1 100755
--- a/auto_cpufreq/core.py
+++ b/auto_cpufreq/core.py
@@ -391,30 +391,13 @@ def get_current_gov():

elif stats:
not_running_daemon_check()
config_info_dialog()
diff --git c/auto_cpufreq/core.py i/auto_cpufreq/core.py
index b51d55d..4e4b5d3 100755
--- c/auto_cpufreq/core.py
+++ i/auto_cpufreq/core.py
@@ -277,18 +277,12 @@ def get_current_gov():
)

def cpufreqctl():
- """
- deploy cpufreqctl script
- deploy cpufreqctl.auto-cpufreq script
- """
-
- # detect if running on a SNAP
- if os.getenv("PKG_MARKER") == "SNAP":
- pass
- else:
- # deploy cpufreqctl.auto-cpufreq script
- if not os.path.isfile("/usr/local/bin/cpufreqctl.auto-cpufreq"):
- shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/local/bin/cpufreqctl.auto-cpufreq")
- if not (IS_INSTALLED_WITH_SNAP or os.path.isfile("/usr/local/bin/cpufreqctl.auto-cpufreq")):
- copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/local/bin/cpufreqctl.auto-cpufreq")
+ # scripts are already in the correct place
+ pass


def cpufreqctl_restore():
- """
- remove cpufreqctl.auto-cpufreq script
- """
- # detect if running on a SNAP
- if os.getenv("PKG_MARKER") == "SNAP":
- pass
- else:
- if os.path.isfile("/usr/local/bin/cpufreqctl.auto-cpufreq"):
- os.remove("/usr/local/bin/cpufreqctl.auto-cpufreq")
-
- if not IS_INSTALLED_WITH_SNAP and os.path.isfile("/usr/local/bin/cpufreqctl.auto-cpufreq"):
- os.remove("/usr/local/bin/cpufreqctl.auto-cpufreq")
+ # no need to restore
+ pass

def footer(l=79):
print("\n" + "-" * l + "\n")
@@ -441,30 +424,8 @@ def remove_complete_msg():
def footer(l=79): print("\n" + "-" * l + "\n")

@@ -306,27 +300,8 @@ def remove_complete_msg():
footer()

def deploy_daemon():
- print("\n" + "-" * 21 + " Deploying auto-cpufreq as a daemon " + "-" * 22 + "\n")
-
- # deploy cpufreqctl script func call
- cpufreqctl()
- cpufreqctl() # deploy cpufreqctl script func call
-
- # turn off bluetooth on boot
- bluetooth_disable()
- bluetooth_disable() # turn off bluetooth on boot
-
- auto_cpufreq_stats_path.touch(exist_ok=True)
-
- print("\n* Deploy auto-cpufreq install script")
- shutil.copy(SCRIPTS_DIR / "auto-cpufreq-install.sh", "/usr/local/bin/auto-cpufreq-install")
- copy(SCRIPTS_DIR / "auto-cpufreq-install.sh", "/usr/local/bin/auto-cpufreq-install")
-
- print("\n* Deploy auto-cpufreq remove script")
- shutil.copy(SCRIPTS_DIR / "auto-cpufreq-remove.sh", "/usr/local/bin/auto-cpufreq-remove")
- copy(SCRIPTS_DIR / "auto-cpufreq-remove.sh", "/usr/local/bin/auto-cpufreq-remove")
-
- # output warning if gnome power profile is running
- gnome_power_detect_install()
- gnome_power_svc_disable()
-
- # output warning if TLP service is detected
- tlp_service_detect()
- tlp_service_detect() # output warning if TLP service is detected
-
- call("/usr/local/bin/auto-cpufreq-install", shell=True)
+ # prevent needless copying and system changes
+ pass


def deploy_daemon_performance():
@@ -504,40 +465,7 @@ def deploy_daemon_performance():
print("\n" + "-" * 21 + " Deploying auto-cpufreq as a daemon (performance) " + "-" * 22 + "\n")
@@ -359,34 +334,7 @@ def deploy_daemon_performance():
call("/usr/local/bin/auto-cpufreq-install", shell=True)

# remove auto-cpufreq daemon
def remove_daemon():
-
- # check if auto-cpufreq is installed
- if not os.path.exists("/usr/local/bin/auto-cpufreq-remove"):
- print("\nauto-cpufreq daemon is not installed.\n")
- sys.exit(1)
-
- print("\n" + "-" * 21 + " Removing auto-cpufreq daemon " + "-" * 22 + "\n")
-
- # turn on bluetooth on boot
- bluetooth_enable()
- bluetooth_enable() # turn on bluetooth on boot
-
- # output warning if gnome power profile is stopped
- gnome_power_rm_reminder()
Expand All @@ -144,19 +128,15 @@ index 58cedb7..c50b0e1 100755
- os.remove("/usr/local/bin/auto-cpufreq-remove")
-
- # delete override pickle if it exists
- if os.path.exists(governor_override_state):
- os.remove(governor_override_state)
- if os.path.exists(governor_override_state): os.remove(governor_override_state)
-
- # delete stats file
- if auto_cpufreq_stats_path.exists():
- if auto_cpufreq_stats_file is not None:
- auto_cpufreq_stats_file.close()
-
- if auto_cpufreq_stats_file is not None: auto_cpufreq_stats_file.close()
- auto_cpufreq_stats_path.unlink()
-
- # restore original cpufrectl script
- cpufreqctl_restore()
- cpufreqctl_restore() # restore original cpufrectl script
+ pass


def gov_check():
for gov in AVAILABLE_GOVERNORS:
Loading

0 comments on commit e293846

Please sign in to comment.