Merge pull request containers#6673 from ashley-cui/master

[CI:DOCS] Fix remote docs
QiWang19 · Jun 18, 2020 · a2661b1 · a2661b1
2 parents e6b9b3a + 4dc9340
commit a2661b1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 73 deletions.
diff --git a/docs/remote-docs.sh b/docs/remote-docs.sh
@@ -79,11 +79,6 @@ function pub_pages() {
         $publisher $f
     done
 
-    # rename podman-remote.ext to podman.ext and copy
-    local remote=$(echo $TARGET/podman-remote.*)
-    local ext=${remote##*.}
-    cp -f $remote $TARGET/podman.$ext
-
     for c in "container" "image" "pod" "volume" ""; do
         local cmd=${c:+-$c}
         for s in $($PODMAN $c --help | sed -n '/^Available Commands:/,/^Flags:/p' | sed -e '1d;$d' -e '/^$/d' | awk '{print $1}'); do
@@ -92,6 +87,26 @@ function pub_pages() {
     done
 }
 
+## rename renames podman-remote.ext to podman.ext, and fixes up contents to reflect change
+function rename (){
+    if [[ "$PLATFORM" != linux ]]; then
+        local remote=$(echo $TARGET/podman-remote.*)
+        local ext=${remote##*.}
+        mv $remote $TARGET/podman.$ext
+
+        $(sed -i "s/podman\\\*-remote/podman/g" $TARGET/podman.$ext)
+        $(sed -i "s/A\ remote\ CLI\ for\ Podman\:\ //g" $TARGET/podman.$ext)
+        case $PLATFORM in
+        darwin|linux)
+            $(sed -i "s/Podman\\\*-remote/Podman\ for\ Mac/g" $TARGET/podman.$ext)
+        ;;
+        windows)
+            $(sed -i "s/Podman\\\*-remote/Podman\ for\ Windows/g" $TARGET/podman.$ext)
+        ;;
+        esac
+    fi
+}
+
 ## walk the SOURCES for markdown sources
 mkdir -p $TARGET
 for s in $SOURCES; do
@@ -101,3 +116,4 @@ for s in $SOURCES; do
         echo >&2 "Warning: $s does not exist"
     fi
 done
+rename
diff --git a/docs/source/markdown/podman-remote.1.md b/docs/source/markdown/podman-remote.1.md
@@ -132,14 +132,3 @@ the exit codes follow the `chroot` standard, see below:
 | [podman-unpause(1)](podman-unpause.1.md)         | Unpause one or more containers.                                             |
 | [podman-version(1)](podman-version.1.md)         | Display the Podman version information.                                     |
 | [podman-volume(1)](podman-volume.1.md)           | Manage Volumes.                                                             |
-
-## FILES
-
-**podman-remote.conf** (`$HOME/.config/containers/podman-remote.conf`)
-
-    The podman-remote.conf file is the default configuration file for the podman
-    remote client.  It is in the TOML format.  It is primarily used to keep track
-    of the user's remote connections.
-
-## SEE ALSO
-`podman-remote.conf(5)`
diff --git a/docs/source/markdown/podman-remote.conf.5.md b/docs/source/markdown/podman-remote.conf.5.md