containers
/
toolbox
mirror of https://github.com/containers/toolbox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix spelling mistakes 

The noun is 'setup' and the verb is 'set up'.  Similarly 'lookup' and
'look up'.

Original patch from Erik Sjölund for Podman [1,2].

[1] Podman commit aa4279ae151fa9df
    https://github.com/containers/podman/commit/aa4279ae151fa9df
    https://github.com/containers/podman/pull/14658

[2] Podman commit 2827140907255ed0
    https://github.com/containers/podman/commit/2827140907255ed0
    https://github.com/containers/podman/pull/14659

https://github.com/containers/toolbox/pull/1223
This commit is contained in:
Debarshi Ray 2023-01-31 15:42:49 +01:00
parent 0a29b374e6
commit 052666840a
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/dependencies-centos-9-stream.yaml
View File

@ -44,7 +44,7 @@
args: args:
chdir: '{{ zuul.project.src_dir }}/src' chdir: '{{ zuul.project.src_dir }}/src'
- name: Setup Git submodules - name: Set up Git submodules
shell: | shell: |
git submodule init git submodule init
git submodule update git submodule update

2
playbooks/dependencies-fedora.yaml
View File

@ -44,7 +44,7 @@
args: args:
chdir: '{{ zuul.project.src_dir }}/src' chdir: '{{ zuul.project.src_dir }}/src'
- name: Setup Git submodules - name: Set up Git submodules
shell: | shell: |
git submodule init git submodule init
git submodule update git submodule update

2
src/cmd/initContainer.go
View File

@ -319,7 +319,7 @@ func initContainer(cmd *cobra.Command, args []string) error {
uidString := strconv.Itoa(initContainerFlags.uid) uidString := strconv.Itoa(initContainerFlags.uid)
targetUser, err := user.LookupId(uidString) targetUser, err := user.LookupId(uidString)
if err != nil { if err != nil {
return fmt.Errorf("failed to lookup user ID %s: %w", uidString, err) return fmt.Errorf("failed to look up user ID %s: %w", uidString, err)
} }
toolboxRuntimeDirectory, err := utils.GetRuntimeDirectory(targetUser) toolboxRuntimeDirectory, err := utils.GetRuntimeDirectory(targetUser)

2
src/cmd/utils.go
View File

@ -219,7 +219,7 @@ func showManual(manual string) error {
return nil return nil
} }
return errors.New("failed to lookup man(1)") return errors.New("failed to look up man(1)")
} }
manualArgs := []string{"man", manual} manualArgs := []string{"man", manual}

2
test/system/000-setup.bats
View File

@ -17,7 +17,7 @@
load 'libs/helpers' load 'libs/helpers'
@test "test suite: Setup" { @test "test suite: Set up" {
local os_release="$(find_os_release)" local os_release="$(find_os_release)"
local system_id="$(get_system_id)" local system_id="$(get_system_id)"
local system_version="$(get_system_version)" local system_version="$(get_system_version)"

4
test/system/libs/helpers.bash
View File

@ -47,7 +47,7 @@ function _setup_environment() {
function _setup_containers_storage() { function _setup_containers_storage() {
mkdir -p ${TEMP_STORAGE_DIR} mkdir -p ${TEMP_STORAGE_DIR}
# Setup a storage config file for PODMAN # Set up a storage config file for PODMAN
echo -e "[storage]\n driver = \"overlay\"\n rootless_storage_path = \"${ROOTLESS_PODMAN_STORE_DIR}\"\n runroot = \"${ROOTLESS_PODMAN_RUNROOT_DIR}\"\n" > ${PODMAN_STORE_CONFIG_FILE} echo -e "[storage]\n driver = \"overlay\"\n rootless_storage_path = \"${ROOTLESS_PODMAN_STORE_DIR}\"\n runroot = \"${ROOTLESS_PODMAN_RUNROOT_DIR}\"\n" > ${PODMAN_STORE_CONFIG_FILE}
export CONTAINERS_STORAGE_CONF=${PODMAN_STORE_CONFIG_FILE} export CONTAINERS_STORAGE_CONF=${PODMAN_STORE_CONFIG_FILE}
} }
@ -513,7 +513,7 @@ function get_system_version() {
} }
# Setup the XDG_RUNTIME_DIR variable if not set # Set up the XDG_RUNTIME_DIR variable if not set
function check_xdg_runtime_dir() { function check_xdg_runtime_dir() {
if [[ -z "${XDG_RUNTIME_DIR}" ]]; then if [[ -z "${XDG_RUNTIME_DIR}" ]]; then
export XDG_RUNTIME_DIR="/run/user/${UID}" export XDG_RUNTIME_DIR="/run/user/${UID}"