diff options
| author | Mark Wong <markwkm@gmail.com> | 2023-05-21 12:58:43 -0700 |
|---|---|---|
| committer | Mark Wong <markwkm@gmail.com> | 2023-05-21 12:58:43 -0700 |
| commit | 7a5cdbbc15b5c8a6ec7287e1cf738ab8655b200c (patch) | |
| tree | fe5d09f04149d96d5d0d5a2b51687f4742b10f18 | |
| parent | 347ae4c6f5579b39729436c28504df9aa539670d (diff) | |
Move AppImage files
Put AppImage specific files in "appimage" directory, expect pg_top.png
as only the .svg file is needed.
Move the "container" directory to "tools".
Rename the appimage scripts.
| -rw-r--r-- | .containerfileignore | 1 | ||||
| -rwxr-xr-x | appimage/AppRun (renamed from AppRun) | 0 | ||||
| -rw-r--r-- | appimage/pg_top.appdata.xml (renamed from pg_top.appdata.xml) | 0 | ||||
| -rw-r--r-- | appimage/pg_top.desktop (renamed from pg_top.desktop) | 0 | ||||
| -rw-r--r-- | appimage/pg_top.svg (renamed from pg_top.svg) | 0 | ||||
| -rw-r--r-- | container/README.rst | 4 | ||||
| -rw-r--r-- | pg_top.png | bin | 19213 -> 0 bytes | |||
| -rw-r--r-- | tools/README.rst | 5 | ||||
| -rwxr-xr-x | tools/build-appimage (renamed from container/appimage-build) | 2 | ||||
| -rwxr-xr-x | tools/build-appimage-container (renamed from container/appimage-prepare) | 0 |
10 files changed, 6 insertions, 6 deletions
diff --git a/.containerfileignore b/.containerfileignore index 2a3018d..c0da828 100644 --- a/.containerfileignore +++ b/.containerfileignore @@ -3,7 +3,6 @@ build/ cmake_install.cmake CMakeCache.txt -container/** Containerfile* .containerignore .git diff --git a/pg_top.appdata.xml b/appimage/pg_top.appdata.xml index 2d1e528..2d1e528 100644 --- a/pg_top.appdata.xml +++ b/appimage/pg_top.appdata.xml diff --git a/pg_top.desktop b/appimage/pg_top.desktop index d9bf5de..d9bf5de 100644 --- a/pg_top.desktop +++ b/appimage/pg_top.desktop diff --git a/pg_top.svg b/appimage/pg_top.svg index 965c308..965c308 100644 --- a/pg_top.svg +++ b/appimage/pg_top.svg diff --git a/container/README.rst b/container/README.rst deleted file mode 100644 index fec16ca..0000000 --- a/container/README.rst +++ /dev/null @@ -1,4 +0,0 @@ -This is a collection of scripts to use Podman for specific tasks: - -* appimage-prepare - Build a container image to use for creating an AppImage. -* appimage-build - Create an AppImage for pg_top. diff --git a/pg_top.png b/pg_top.png Binary files differdeleted file mode 100644 index 7c9bdbe..0000000 --- a/pg_top.png +++ /dev/null diff --git a/tools/README.rst b/tools/README.rst new file mode 100644 index 0000000..e413c14 --- /dev/null +++ b/tools/README.rst @@ -0,0 +1,5 @@ +This is a collection of scripts to use Podman for specific tasks: + +* build-appimage - Create an AppImage for pg_top. +* build-appimage-container - Build a container image to use for creating an + AppImage. diff --git a/container/appimage-build b/tools/build-appimage index 798d1e0..169f8b4 100755 --- a/container/appimage-build +++ b/tools/build-appimage @@ -11,7 +11,7 @@ CONTAINER_TAG="pg_top-appimage" # Use the return code from `podman inspect` to determine if the container image # needs to be created. if ! podman inspect $CONTAINER_TAG > /dev/null 2>&1; then - "${CONTAINER_DIR}/appimage-prepare" || exit 1 + "${CONTAINER_DIR}/build-appimage_container" || exit 1 fi podman run --rm -v "${CONTAINER_DIR}/..:/usr/local/src/pg_top:rw" \ diff --git a/container/appimage-prepare b/tools/build-appimage-container index aad8275..aad8275 100755 --- a/container/appimage-prepare +++ b/tools/build-appimage-container |
