aboutsummaryrefslogtreecommitdiff
path: root/share/trashman/docker
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-11-17 11:35:59 -0200
committerSilvio Rhatto <rhatto@riseup.net>2017-11-17 11:35:59 -0200
commit24bcf01f1580e1c228bafbac4af7fe7ce4e98eb9 (patch)
treeb5d06da2d89f4fd67b639359c5df67563140a183 /share/trashman/docker
parentb28a6ee5f6de51085dcf3be943a87cc674fadfe0 (diff)
downloadtrashman-24bcf01f1580e1c228bafbac4af7fe7ce4e98eb9.tar.gz
trashman-24bcf01f1580e1c228bafbac4af7fe7ce4e98eb9.tar.bz2
Rename __trashman_ functions to trashman_
Diffstat (limited to 'share/trashman/docker')
-rwxr-xr-xshare/trashman/docker/unix/linux/debian/check4
-rwxr-xr-xshare/trashman/docker/unix/linux/debian/install16
-rwxr-xr-xshare/trashman/docker/unix/linux/debian/test2
3 files changed, 11 insertions, 11 deletions
diff --git a/share/trashman/docker/unix/linux/debian/check b/share/trashman/docker/unix/linux/debian/check
index 60574a7..9ca9d78 100755
--- a/share/trashman/docker/unix/linux/debian/check
+++ b/share/trashman/docker/unix/linux/debian/check
@@ -12,13 +12,13 @@ SHARE="$1"
if [ -e "/etc/apt/trusted.gpg.d/docker.gpg" ] && \
[ -e "/etc/apt/sources.list.d/docker.list" ] && \
- __trashman_apt_check docker-ce; then
+ trashman_apt_check docker-ce; then
exit 0
fi
if [ ! -e "/etc/apt/trusted.gpg.d/docker.gpg" ] && \
[ ! -e "/etc/apt/sources.list.d/docker.list" ] && \
- ! __trashman_apt_check docker-ce; then
+ ! trashman_apt_check docker-ce; then
exit 1
fi
diff --git a/share/trashman/docker/unix/linux/debian/install b/share/trashman/docker/unix/linux/debian/install
index 1558020..b80caba 100755
--- a/share/trashman/docker/unix/linux/debian/install
+++ b/share/trashman/docker/unix/linux/debian/install
@@ -10,22 +10,22 @@ SHARE="$1"
. $SHARE/trashman/functions || exit 1
. $SHARE/trashman/debian || exit 1
-DISTRO="`__trashman_distro`"
-ARCH="`__trashman_debian_arch`"
-RELEASE="`__trashman_distro_release`"
+DISTRO="`trashman_distro`"
+ARCH="`trashman_debian_arch`"
+RELEASE="`trashman_distro_release`"
# Install requirements
-apt-get update && __trashman_apt_install apt-transport-https
+apt-get update && trashman_apt_install apt-transport-https
# Install pubkey
-__trashman_install_apt_key $SHARE/docker/unix/linux/debian/pubkey.gpg docker.gpg
+trashman_install_apt_key $SHARE/docker/unix/linux/debian/pubkey.gpg docker.gpg
# Create sources.list entry
echo "deb [arch=$ARCH] https://download.docker.com/linux/$DISTRO $RELEASE stable" > /etc/apt/sources.list.d/docker.list
# Update and install
-apt-get update && __trashman_apt_install docker-ce || exit 1
+apt-get update && trashman_apt_install docker-ce || exit 1
# Additional info
-__trashman_echo "Docker sucessfully installed."
-__trashman_echo "You might want to add your regular user into the 'docker' group"
+trashman_echo "Docker sucessfully installed."
+trashman_echo "You might want to add your regular user into the 'docker' group"
diff --git a/share/trashman/docker/unix/linux/debian/test b/share/trashman/docker/unix/linux/debian/test
index 69611ba..35dc626 100755
--- a/share/trashman/docker/unix/linux/debian/test
+++ b/share/trashman/docker/unix/linux/debian/test
@@ -15,7 +15,7 @@ if ! which docker > /dev/null 2>&1; then
fi
# Run hello-world test program
-__trashman_echo "Running docker helll-world image..."
+trashman_echo "Running docker helll-world image..."
docker run hello-world
status="$?"