Skip to content

Commit 591849e

Browse files
author
Christian Rebischke
authored
Merge pull request #59 from shibumi/shibumi/fix-ci-errors
fixed format and syntax for various files
2 parents c19e835 + 5a95431 commit 591849e

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

controller.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python
2-
#-*- encoding; utf-8 -*-
2+
# -*- encoding; utf-8 -*-
33
#
44
# Author: Christian Rebischke <[email protected]>
55
# This file is licensed under GPLv3

generic-ci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ case $1 in
1717
gpg --with-fingerprint --with-colons hashicorp.key | grep ${HASHICORP_FINGERPRINT^^}
1818
gpg --import hashicorp.key
1919
gpg --verify "packer_${PACKER_CURRENT_VERSION}_SHA256SUMS.sig" "packer_${PACKER_CURRENT_VERSION}_SHA256SUMS"
20-
grep linux_amd64 "packer_${PACKER_CURRENT_VERSION}_SHA256SUMS" > packer_SHA256SUM_linux_amd64
20+
grep linux_amd64 "packer_${PACKER_CURRENT_VERSION}_SHA256SUMS" >packer_SHA256SUM_linux_amd64
2121
sha256sum --check --status packer_SHA256SUM_linux_amd64
2222
unzip "packer_${PACKER_CURRENT_VERSION}_linux_amd64.zip"
2323
./packer --version

http/install-chroot.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ set -x
66
ln -sf /usr/share/zoneinfo/UTC /etc/localtime
77
sed -i -e 's/^#\(en_US.UTF-8\)/\1/' /etc/locale.gen
88
locale-gen
9-
echo 'LANG=en_US.UTF-8' > /etc/locale.conf
9+
echo 'LANG=en_US.UTF-8' >/etc/locale.conf
1010

1111
# setting vagrant user credentials
1212
echo -e 'vagrant\nvagrant' | passwd
1313
useradd -m -U vagrant
1414
echo -e 'vagrant\nvagrant' | passwd vagrant
1515

1616
# setting automatic authentication for any action requiring admin rights via Polkit
17-
cat <<EOF > /etc/polkit-1/rules.d/49-nopasswd_global.rules
17+
cat <<EOF >/etc/polkit-1/rules.d/49-nopasswd_global.rules
1818
polkit.addRule(function(action, subject) {
1919
if (subject.isInGroup("vagrant")) {
2020
return polkit.Result.YES;
@@ -23,7 +23,7 @@ polkit.addRule(function(action, subject) {
2323
EOF
2424

2525
# setting sudo for vagrant user
26-
cat <<EOF > /etc/sudoers.d/vagrant
26+
cat <<EOF >/etc/sudoers.d/vagrant
2727
Defaults:vagrant !requiretty
2828
vagrant ALL=(ALL) NOPASSWD: ALL
2929
EOF
@@ -39,7 +39,7 @@ chmod 0600 /home/vagrant/.ssh/authorized_keys
3939
ln -s /dev/null /etc/systemd/network/99-default.link
4040

4141
# setup network
42-
cat <<EOF > /etc/systemd/network/eth0.network
42+
cat <<EOF >/etc/systemd/network/eth0.network
4343
[Match]
4444
Name=eth0
4545
@@ -48,7 +48,7 @@ DHCP=ipv4
4848
EOF
4949

5050
# Setup pacman-init.service for clean pacman keyring initialization
51-
cat <<EOF > /etc/systemd/system/pacman-init.service
51+
cat <<EOF >/etc/systemd/system/pacman-init.service
5252
[Unit]
5353
Description=Initializes Pacman keyring
5454
Wants=haveged.service
@@ -74,6 +74,6 @@ systemctl enable systemd-networkd
7474
systemctl enable systemd-resolved
7575
systemctl enable pacman-init.service
7676

77-
grub-install "$device"
77+
grub-install
7878
sed -i -e 's/^GRUB_TIMEOUT=.*$/GRUB_TIMEOUT=1/' /etc/default/grub
7979
grub-mkconfig -o /boot/grub/grub.cfg

http/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ mount "${device}2" /mnt
2727

2828
pacstrap /mnt base linux grub openssh sudo polkit haveged
2929
swapon "${device}1"
30-
genfstab -p /mnt >> /mnt/etc/fstab
30+
genfstab -p /mnt >>/mnt/etc/fstab
3131
swapoff "${device}1"
3232

3333
arch-chroot /mnt /bin/bash

provision/write_zeroes.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#/bin/bash
1+
#!/bin/bash
22

33
set -e
44
set -x

0 commit comments

Comments
 (0)