diff options
| author | Jesse Luehrs <doy@tozt.net> | 2022-08-30 22:23:58 -0400 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2022-08-30 22:23:58 -0400 |
| commit | 9db4f014fdfde48062e7ba90802c390144a948a6 (patch) | |
| tree | 339961bf1cbb6611298c42b8faca8d5af528327a | |
| parent | d252880dd0189e015942d025b6d4e5eef3cb9096 (diff) | |
| download | puppet-tozt-9db4f014fdfde48062e7ba90802c390144a948a6.tar.gz puppet-tozt-9db4f014fdfde48062e7ba90802c390144a948a6.zip | |
switch from yaourt to yay
| -rw-r--r-- | modules/base/files/pacman-cron | 2 | ||||
| -rw-r--r-- | modules/base/files/yaourtrc | 1 | ||||
| -rw-r--r-- | modules/base/manifests/operatingsystem.pp | 2 | ||||
| -rw-r--r-- | modules/base/manifests/tools.pp | 2 | ||||
| -rw-r--r-- | modules/base/templates/update | 3 | ||||
| -rw-r--r-- | modules/tick/files/plugins/pacman | 2 | ||||
| -rw-r--r-- | modules/yaourt/manifests/init.pp | 20 |
7 files changed, 5 insertions, 27 deletions
diff --git a/modules/base/files/pacman-cron b/modules/base/files/pacman-cron index 5c19288..fb06f76 100644 --- a/modules/base/files/pacman-cron +++ b/modules/base/files/pacman-cron @@ -1,3 +1,3 @@ #!/bin/sh -TERM=xterm yaourt -Sya > /dev/null +TERM=xterm yay -Sya > /dev/null diff --git a/modules/base/files/yaourtrc b/modules/base/files/yaourtrc deleted file mode 100644 index f80480e..0000000 --- a/modules/base/files/yaourtrc +++ /dev/null @@ -1 +0,0 @@ -EDITFILES=0 diff --git a/modules/base/manifests/operatingsystem.pp b/modules/base/manifests/operatingsystem.pp index 4229fcc..17ac8b7 100644 --- a/modules/base/manifests/operatingsystem.pp +++ b/modules/base/manifests/operatingsystem.pp @@ -14,8 +14,6 @@ class base::operatingsystem { target => "/usr/share/zoneinfo/UTC"; "/etc/hosts": content => template('base/hosts'); - '/etc/yaourtrc': - source => 'puppet:///modules/base/yaourtrc'; } cron::job { "pacman": diff --git a/modules/base/manifests/tools.pp b/modules/base/manifests/tools.pp index 88deaf1..a4f2f95 100644 --- a/modules/base/manifests/tools.pp +++ b/modules/base/manifests/tools.pp @@ -1,5 +1,5 @@ class base::tools { - include yaourt + include yay package { [ diff --git a/modules/base/templates/update b/modules/base/templates/update index 9007bc7..68bb1cd 100644 --- a/modules/base/templates/update +++ b/modules/base/templates/update @@ -7,6 +7,7 @@ puppet-tozt (cd ~/conf && git pull && make install) sudo sh -c "cd ~/conf && git pull && make install" -yaourt -Syua +yay +yay -Yc rustup update <%= @extra_script %> diff --git a/modules/tick/files/plugins/pacman b/modules/tick/files/plugins/pacman index a466487..e95621f 100644 --- a/modules/tick/files/plugins/pacman +++ b/modules/tick/files/plugins/pacman @@ -1,4 +1,4 @@ #!/bin/sh -update_count="$( (yaourt -Qua || true) | wc -l)" +update_count="$(yay -Qu | wc -l)" echo "pacman updates=${update_count}i" diff --git a/modules/yaourt/manifests/init.pp b/modules/yaourt/manifests/init.pp deleted file mode 100644 index 871cac8..0000000 --- a/modules/yaourt/manifests/init.pp +++ /dev/null @@ -1,20 +0,0 @@ -class yaourt { - package { - [ - "yajl" - ]: - ensure => 'installed', - install_options => ["--asdeps"]; - } - - package::makepkg { 'package-query': - ensure => installed, - asdeps => true, - require => Package['yajl']; - } - - package::makepkg { 'yaourt': - ensure => installed, - require => Package::Makepkg['package-query']; - } -} |