From 278288a4a43e0490dc01bf4b9ab233e045361697 Mon Sep 17 00:00:00 2001 From: Dominik Polakovics Date: Sat, 30 Sep 2023 13:18:13 +0200 Subject: [PATCH] change wow addon manager --- .../modules/wow-addon-manager.nix | 5 +++-- hosts/steamdeck.cloonar.com/modules/wow.nix | 20 +++++++++---------- utils/pkgs/wow-addon-manager/default.nix | 4 +++- .../{ => src}/addons.classic.list.sample | 0 .../{ => src}/addons.list.sample | 0 .../{ => src}/wow-addon-manager | 7 ++----- 6 files changed, 17 insertions(+), 19 deletions(-) rename utils/pkgs/wow-addon-manager/{ => src}/addons.classic.list.sample (100%) rename utils/pkgs/wow-addon-manager/{ => src}/addons.list.sample (100%) rename utils/pkgs/wow-addon-manager/{ => src}/wow-addon-manager (94%) diff --git a/hosts/steamdeck.cloonar.com/modules/wow-addon-manager.nix b/hosts/steamdeck.cloonar.com/modules/wow-addon-manager.nix index abcac55..b86c3c8 100644 --- a/hosts/steamdeck.cloonar.com/modules/wow-addon-manager.nix +++ b/hosts/steamdeck.cloonar.com/modules/wow-addon-manager.nix @@ -15,8 +15,8 @@ with lib; }; startAt = mkOption { type = with types; either str (listOf str); - default = "*:0/15"; - example = "*:0/15"; + default = "*-*-* 01:15:00"; + example = "*-*-* 01:15:00"; description = lib.mdDoc '' The time(s) to run wow-addon-manager updates. Specified in systemd's time format; see @@ -112,6 +112,7 @@ with lib; serviceConfig = { Type = "oneshot"; User = cfg.user; + Environment = "PATH=${pkgs.wget}/bin:${pkgs.unzip}/bin:${pkgs.gnused}/bin:${pkgs.coreutils}/bin:${pkgs.gnugrep}/bin:${pkgs.git}/bin:${pkgs.curl}:/bin:${pkgs.rsync}/bin"; }; }; environment.etc = { diff --git a/hosts/steamdeck.cloonar.com/modules/wow.nix b/hosts/steamdeck.cloonar.com/modules/wow.nix index 333dc3a..3d8308e 100644 --- a/hosts/steamdeck.cloonar.com/modules/wow.nix +++ b/hosts/steamdeck.cloonar.com/modules/wow.nix @@ -4,19 +4,17 @@ enable = true; user = "dominik"; addonList = '' - https://www.curseforge.com/wow/addons/console-port/download - https://www.curseforge.com/wow/addons/immersion/download - https://www.curseforge.com/wow/addons/dynamiccam/download - https://www.curseforge.com/wow/addons/bagnon/download - https://www.curseforge.com/wow/addons/guidelime/download + https://www.wowinterface.com/downloads/info23536-ConsolePort.html + https://www.wowinterface.com/downloads/info24714-Immersion.html + https://www.wowinterface.com/downloads/info25570-DynamicCam.html + https://www.wowinterface.com/downloads/info4459-Bagnon.html ''; classicAddonList = '' - https://www.curseforge.com/wow/addons/console-port/download - https://www.curseforge.com/wow/addons/immersion/download - https://www.curseforge.com/wow/addons/dynamiccam/download - https://www.curseforge.com/wow/addons/bagnon/download - https://www.curseforge.com/wow/addons/guidelime/download - https://www.curseforge.com/wow/addons/guidelime_sage/download + https://www.wowinterface.com/downloads/info23536-ConsolePort.html + https://www.wowinterface.com/downloads/info24714-Immersion.html + https://www.wowinterface.com/downloads/info25570-DynamicCam.html + https://www.wowinterface.com/downloads/info4459-Bagnon.html + https://github.com/max-ri/Guidelime.git ''; }; } diff --git a/utils/pkgs/wow-addon-manager/default.nix b/utils/pkgs/wow-addon-manager/default.nix index d946de3..b28b758 100644 --- a/utils/pkgs/wow-addon-manager/default.nix +++ b/utils/pkgs/wow-addon-manager/default.nix @@ -2,9 +2,11 @@ stdenv.mkDerivation { name = "wow-addon-manager"; - src = "./"; + src = ./src; nativeBuildInputs = [ makeWrapper ]; installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share install -Dm555 wow-addon-manager $out/bin/ install -Dm444 addons.list.sample $out/share/ install -Dm444 addons.classic.list.sample $out/share/ diff --git a/utils/pkgs/wow-addon-manager/addons.classic.list.sample b/utils/pkgs/wow-addon-manager/src/addons.classic.list.sample similarity index 100% rename from utils/pkgs/wow-addon-manager/addons.classic.list.sample rename to utils/pkgs/wow-addon-manager/src/addons.classic.list.sample diff --git a/utils/pkgs/wow-addon-manager/addons.list.sample b/utils/pkgs/wow-addon-manager/src/addons.list.sample similarity index 100% rename from utils/pkgs/wow-addon-manager/addons.list.sample rename to utils/pkgs/wow-addon-manager/src/addons.list.sample diff --git a/utils/pkgs/wow-addon-manager/wow-addon-manager b/utils/pkgs/wow-addon-manager/src/wow-addon-manager similarity index 94% rename from utils/pkgs/wow-addon-manager/wow-addon-manager rename to utils/pkgs/wow-addon-manager/src/wow-addon-manager index 8f6d9f2..de49a17 100755 --- a/utils/pkgs/wow-addon-manager/wow-addon-manager +++ b/utils/pkgs/wow-addon-manager/src/wow-addon-manager @@ -203,13 +203,13 @@ function dlAddon { REMEMBERPATH="$(pwd)" SCRIPTDIR="$(echo $0 | sed 's/\/cullingOfStratholme.sh//g')" ADDONLIST=addon.list -ADDONPATH=/home/dominik/.local/share/Steam/steamapps/compatdata/3525601306/pfx/drive_c/Program Files (x86)/World of Warcraft/_retail_/Interface/AddOns +ADDONPATH="/home/dominik/.local/share/Steam/steamapps/compatdata/3525601306/pfx/drive_c/Program Files (x86)/World of Warcraft/_retail_/Interface/AddOns" if [ "$1" == "classic" ] then echo "Install mods for classic..." ADDONLIST=addon.classic.list - ADDONPATH=/home/dominik/.local/share/Steam/steamapps/compatdata/3525601306/pfx/drive_c/Program Files (x86)/World of Warcraft/_classic_/Interface/AddOns + ADDONPATH="/home/dominik/.local/share/Steam/steamapps/compatdata/3525601306/pfx/drive_c/Program Files (x86)/World of Warcraft/_classic_era_/Interface/AddOns" echo ${ADDONLIST} echo ${ADDONPATH} fi @@ -230,9 +230,6 @@ do ADDONCOUNT=$(($ADDONCOUNT + 1)) done < $ALFULL -GREEN="$(tput setaf 2)" -CRESET="$(tput sgr0)" - if [ "$1" == "list" ] then printList