From ec1ecc81ad6c862db39f4bfd0fd830f44909b61a Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Mon, 14 Sep 2020 16:59:55 +0100
Subject: [PATCH] Fix cookstyle warnings

---
 .rubocop.yml                               | 3 +++
 cookbooks/networking/attributes/default.rb | 2 +-
 cookbooks/networking/recipes/default.rb    | 4 ++--
 hooks/pre-commit                           | 2 +-
 roles/grisu.rb                             | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 649fc64dc..044181e0d 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -15,6 +15,9 @@ Layout/HeredocIndentation:
 Naming/MethodParameterName:
   Enabled: false
 
+Style/CommandLiteral:
+  EnforcedStyle: percent_x
+
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
 
diff --git a/cookbooks/networking/attributes/default.rb b/cookbooks/networking/attributes/default.rb
index d2ec5957d..6881fcafe 100644
--- a/cookbooks/networking/attributes/default.rb
+++ b/cookbooks/networking/attributes/default.rb
@@ -15,6 +15,6 @@ default[:networking][:search] = []
 default[:networking][:dnssec] = "allow-downgrade"
 default[:networking][:hostname] = node.name
 default[:networking][:wireguard][:enabled] = false
-default[:networking][:wireguard][:address] = "fd43:e709:ea6d:1:#{wireguard_id[0,4]}:#{wireguard_id[4,4]}:#{wireguard_id[8,4]}:#{wireguard_id[12,4]}"
+default[:networking][:wireguard][:address] = "fd43:e709:ea6d:1:#{wireguard_id[0, 4]}:#{wireguard_id[4, 4]}:#{wireguard_id[8, 4]}:#{wireguard_id[12, 4]}"
 default[:networking][:wireguard][:keepalive] = false
 default[:networking][:wireguard][:peers] = []
diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index d638d9132..053d98b78 100644
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -202,11 +202,11 @@ if node[:networking][:wireguard][:enabled]
     owner "root"
     group "systemd-network"
     mode "640"
-    content %x{wg genkey}
+    content %x(wg genkey)
     compile_time true
   end
 
-  node.default[:networking][:wireguard][:public_key] = %x{wg pubkey < /var/lib/systemd/wireguard/private.key}
+  node.default[:networking][:wireguard][:public_key] = %x(wg pubkey < /var/lib/systemd/wireguard/private.key)
 
   file "/var/lib/systemd/wireguard/preshared.key" do
     action :create_if_missing
diff --git a/hooks/pre-commit b/hooks/pre-commit
index cb7bc82d5..60d665932 100755
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -12,7 +12,7 @@ if IO.popen(["git", "ls-files", "--unmerged"]).read.empty?
   end.compact
 
   ruby_files = files.select do |file|
-    file =~ /\.rb$/ || (file !~ /\.erb$/ && `file --brief --mime-type #{file}` == "text/x-ruby\n")
+    file =~ /\.rb$/ || (file !~ /\.erb$/ && %x(file --brief --mime-type #{file}) == "text/x-ruby\n")
   end
 
   ok &&= system("bundle", "exec", "rubocop", *ruby_files) unless ruby_files.empty?
diff --git a/roles/grisu.rb b/roles/grisu.rb
index 45df5c5f4..9aaa6d67b 100644
--- a/roles/grisu.rb
+++ b/roles/grisu.rb
@@ -41,6 +41,6 @@ run_list(
   "role[gateway]",
   "role[web-storage]",
   "role[backup]",
-  "role[planet]",
+  "role[planet]"
   # "role[planetdump]"
 )
-- 
2.43.2