diff options
Diffstat (limited to 'hack')
| -rwxr-xr-x | hack/check_root.sh | 5 | ||||
| -rwxr-xr-x | hack/get_ci_vm.sh | 2 | ||||
| -rw-r--r-- | hack/podman-registry-go/registry.go | 2 | ||||
| -rwxr-xr-x | hack/xref-helpmsgs-manpages | 11 |
4 files changed, 16 insertions, 4 deletions
diff --git a/hack/check_root.sh b/hack/check_root.sh new file mode 100755 index 000000000..203eae9d3 --- /dev/null +++ b/hack/check_root.sh @@ -0,0 +1,5 @@ +#!/bin/bash +if ! [ $(id -u) = 0 ]; then + echo "Please run as root! '$@' requires root privileges." + exit 1 +fi diff --git a/hack/get_ci_vm.sh b/hack/get_ci_vm.sh index 1d48f0996..05b7a4a6d 100755 --- a/hack/get_ci_vm.sh +++ b/hack/get_ci_vm.sh @@ -16,7 +16,7 @@ CPUS="2" MEMORY="4Gb" DISK="200" PROJECT="libpod-218412" -GOSRC="/var/tmp/go/src/github.com/containers/libpod" +GOSRC="/var/tmp/go/src/github.com/containers/podman" GCLOUD_IMAGE=${GCLOUD_IMAGE:-quay.io/cevich/gcloud_centos:latest} GCLOUD_SUDO=${GCLOUD_SUDO-sudo} diff --git a/hack/podman-registry-go/registry.go b/hack/podman-registry-go/registry.go index 5358aa460..7ade48e01 100644 --- a/hack/podman-registry-go/registry.go +++ b/hack/podman-registry-go/registry.go @@ -3,7 +3,7 @@ package registry import ( "strings" - "github.com/containers/libpod/v2/utils" + "github.com/containers/podman/v2/utils" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/hack/xref-helpmsgs-manpages b/hack/xref-helpmsgs-manpages index c1e9dffc4..16b596589 100755 --- a/hack/xref-helpmsgs-manpages +++ b/hack/xref-helpmsgs-manpages @@ -16,6 +16,9 @@ our $VERSION = '0.1'; # For debugging, show data structures using DumpTree($var) #use Data::TreeDumper; $Data::TreeDumper::Displayaddress = 0; +# unbuffer output +$| = 1; + ############################################################################### # BEGIN user-customizable section @@ -266,12 +269,16 @@ sub podman_man { elsif ($section eq 'commands') { # In podman.1.md if ($line =~ /^\|\s*\[podman-(\S+?)\(\d\)\]/) { - $man{$1} = podman_man("podman-$1"); + # $1 will be changed by recursion _*BEFORE*_ left-hand assignment + my $subcmd = $1; + $man{$subcmd} = podman_man("podman-$1"); } # In podman-<subcommand>.1.md elsif ($line =~ /^\|\s+(\S+)\s+\|\s+\[\S+\]\((\S+)\.1\.md\)/) { - $man{$1} = podman_man($2); + # $1 will be changed by recursion _*BEFORE*_ left-hand assignment + my $subcmd = $1; + $man{$subcmd} = podman_man($2); } } |