diff --git a/sift/packages/dotnet.sls b/sift/packages/dotnet.sls index bb697d5..5350cde 100644 --- a/sift/packages/dotnet.sls +++ b/sift/packages/dotnet.sls @@ -6,3 +6,10 @@ sift-package-dotnet9: - name: dotnet-sdk-9.0 - require: - sls: sift.repos.dotnet-backports + +# Eric Zimmerman's tools target net10.0 (sift.scripts.zimmerman). +sift-package-dotnet10-runtime: + pkg.installed: + - name: dotnet-runtime-10.0 + - require: + - sls: sift.repos.dotnet-backports diff --git a/sift/scripts/zimmerman.sls b/sift/scripts/zimmerman.sls index 0566427..d65edc8 100644 --- a/sift/scripts/zimmerman.sls +++ b/sift/scripts/zimmerman.sls @@ -15,7 +15,7 @@ include: download-{{ tool }}: file.managed: - name: /tmp/{{ tool }}.zip - - source: https://download.ericzimmermanstools.com/net9/{{ tool }}.zip + - source: https://download.ericzimmermanstools.com/net/{{ tool }}.zip - skip_verify: True - makedirs: True @@ -33,11 +33,11 @@ extract-{{ tool }}: - contents: | #!/bin/bash {% if tool|lower == "iisgeolocate" or tool|lower == "recmd" or tool|lower == "sqlecmd" %} - dotnet /opt/zimmermantools/{{ tool }}/{{ tool }}.dll ${*} + exec dotnet /opt/zimmermantools/{{ tool }}/{{ tool }}.dll "$@" {% elif tool|lower == "evtxecmd" %} - dotnet /opt/zimmermantools/EvtxeCmd/{{ tool }}.dll ${*} + exec dotnet /opt/zimmermantools/EvtxeCmd/{{ tool }}.dll "$@" {% else %} - dotnet /opt/zimmermantools/{{ tool }}.dll ${*} + exec dotnet /opt/zimmermantools/{{ tool }}.dll "$@" {% endif %} - mode: 755 - replace: True