From b0d36d95f6a747a9eae6f10b97cf10bff04d2331 Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Wed, 7 Jul 2021 15:16:21 -0300 Subject: [PATCH 1/6] update readme description --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cd2455c..397f63d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Cockpit Navigator -A File System Browser for Cockpit. +A Featureful File System Browser for Cockpit - remotely browse, manage, edit, upload, and download files on your server through your web browser. ## Features With no command line use needed, you can: From 75c85df71c85a5d061ebe84a8a904266f99f89d5 Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Wed, 7 Jul 2021 15:20:28 -0300 Subject: [PATCH 2/6] prepare for packaging --- CHANGELOG.md | 4 ++-- README.md | 10 +++++----- manifest.json | 9 +++++++-- packaging/el8/main.spec | 4 ++++ packaging/focal/changelog | 6 ++++++ 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06083a7..ebaef3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,3 @@ -## Cockpit Navigator 0.4.6-2 +## Cockpit Navigator 0.4.6-3 -* First build with auto packaging \ No newline at end of file +* Add relase for el7 \ No newline at end of file diff --git a/README.md b/README.md index 397f63d..7499601 100644 --- a/README.md +++ b/README.md @@ -23,17 +23,17 @@ With no command line use needed, you can: # Installation ## From Github Release ### Ubuntu -1. `$ wget https://github.com/45Drives/cockpit-navigator/releases/download/v0.4/cockpit-navigator_0.4.6-1focal_all.deb` -1. `# apt install ./cockpit-navigator_0.4.6-1focal_all.deb` +1. `$ wget https://github.com/45Drives/cockpit-navigator/releases/download/v0.4/cockpit-navigator_0.4.6-3focal_all.deb` +1. `# apt install ./cockpit-navigator_0.4.6-3focal_all.deb` ### EL7 -1. `# yum install https://github.com/45Drives/cockpit-navigator/releases/download/v0.4/cockpit-navigator-0.4.6-1.el7.noarch.rpm` +1. `# yum install https://github.com/45Drives/cockpit-navigator/releases/download/v0.4/cockpit-navigator-0.4.6-3.el7.noarch.rpm` ### EL8 -1. `# dnf install https://github.com/45Drives/cockpit-navigator/releases/download/v0.4/cockpit-navigator-0.4.6-1.el8.noarch.rpm` +1. `# dnf install https://github.com/45Drives/cockpit-navigator/releases/download/v0.4/cockpit-navigator-0.4.6-3.el8.noarch.rpm` ## From Source 1. Ensure dependencies are installed: `cockpit`, `python3`, `rsync`, `zip`. 1. `$ git clone https://github.com/45Drives/cockpit-navigator.git` 1. `$ cd cockpit-navigator` -1. `$ git checkout ` (v0.4 is latest) +1. `$ git checkout ` (v0.4.6 is latest) 1. `# make install` ## From 45Drives Repositories ### Ubuntu diff --git a/manifest.json b/manifest.json index 5c7a567..5731e81 100644 --- a/manifest.json +++ b/manifest.json @@ -4,7 +4,7 @@ "title": "Cockpit Navigator", "prerelease": false, "version": "0.4.6", - "buildVersion": "2", + "buildVersion": "3", "author": "Josh Boudreau ", "url": "https://github.com/45Drives/cockpit-navigator", "category": "utils", @@ -45,12 +45,17 @@ "image": "rocky-el8-builder", "codeName": "el8", "type": "el" + }, + { + "image": "centos-el7-builder", + "codeName": "el7", + "type": "el" } ], "changelog": { "urgency": "medium", "version": "0.4.6", - "buildVersion": "2", + "buildVersion": "3", "ignore": [], "date": null, "packager": "Josh Boudreau ", diff --git a/packaging/el8/main.spec b/packaging/el8/main.spec index 3c6fbe2..56291ce 100644 --- a/packaging/el8/main.spec +++ b/packaging/el8/main.spec @@ -30,6 +30,10 @@ rm -rf %{buildroot} /usr/share/cockpit/navigator/* %changelog +* Wed Jul 07 2021 Josh Boudreau 0.4.6-3 +- Add relase for el7 +* Wed Jul 07 2021 Josh Boudreau 0.4.6-3 +- Add relase for el7 * Wed Jun 30 2021 Josh Boudreau 0.4.6-2 - First build with auto packaging * Fri Jun 18 2021 Josh Boudreau 0.4.6-1 diff --git a/packaging/focal/changelog b/packaging/focal/changelog index 1bc9bd1..6c749aa 100644 --- a/packaging/focal/changelog +++ b/packaging/focal/changelog @@ -1,3 +1,9 @@ +cockpit-navigator (0.4.6-3focal) focal; urgency=medium + + * Add relase for el7 + + -- Josh Boudreau Wed, 07 Jul 2021 12:19:39 -0300 + cockpit-navigator (0.4.6-2focal) focal; urgency=medium * First build with auto packaging From fb92042c58ee7fdcd1a8cb3e115613d18d7bd5a5 Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Wed, 7 Jul 2021 15:24:32 -0300 Subject: [PATCH 3/6] fix debugging while packaging --- packaging/el8/main.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packaging/el8/main.spec b/packaging/el8/main.spec index 56291ce..68b3817 100644 --- a/packaging/el8/main.spec +++ b/packaging/el8/main.spec @@ -1,3 +1,5 @@ +%global debug_package %{nil} + Name: ::package_name:: Version: ::package_version:: Release: ::package_build_version::%{?dist} From 1111e84d5adcd337f859584e133697b95d3adb20 Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Wed, 7 Jul 2021 15:30:03 -0300 Subject: [PATCH 4/6] split spec files for el7/el8 --- packaging/el7 | 1 - packaging/el7/main.spec | 84 +++++++++++++++++++++++++++++++++++++++++ packaging/el8/main.spec | 2 - 3 files changed, 84 insertions(+), 3 deletions(-) delete mode 120000 packaging/el7 create mode 100644 packaging/el7/main.spec diff --git a/packaging/el7 b/packaging/el7 deleted file mode 120000 index 4dad90d..0000000 --- a/packaging/el7 +++ /dev/null @@ -1 +0,0 @@ -el8 \ No newline at end of file diff --git a/packaging/el7/main.spec b/packaging/el7/main.spec new file mode 100644 index 0000000..cdf5fc9 --- /dev/null +++ b/packaging/el7/main.spec @@ -0,0 +1,84 @@ +%global debug_package %{nil} + +Name: ::package_name:: +Version: ::package_version:: +Release: ::package_build_version::%{?dist} +Summary: ::package_description_short:: +License: ::package_licence:: +URL: ::package_url:: +Source0: %{name}-%{version}.tar.gz +BuildArch: ::package_architecture_el:: +Requires: ::package_dependencies_el:: + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root + +%description +::package_title:: +::package_description_long:: + +%prep +%setup -q + +%build +# empty + +%install +make DESTDIR=%{buildroot} DIST=%{dist} install + +%clean +rm -rf %{buildroot} + +%files +/usr/share/cockpit/navigator/* + +%changelog +* Wed Jul 07 2021 Josh Boudreau 0.4.6-3 +- Add relase for el7 +* Wed Jun 30 2021 Josh Boudreau 0.4.6-2 +- First build with auto packaging +* Fri Jun 18 2021 Josh Boudreau 0.4.6-1 +- Disable navigation buttons when invalid. +* Thu Jun 17 2021 Josh Boudreau 0.4.5-1 +- Fix downloading a single file when the contextmenu + event target is not the file. +* Thu Jun 10 2021 Josh Boudreau 0.4.4-1 +- Hide download option in right click context menu when no items + are explicitly selected. +* Tue Jun 08 2021 Josh Boudreau 0.4.3-1 +- Add sort options for list view. +- Add search bar to filter items. +- Fix file size error after upload by refreshing after write process exits. +- Fix input of tab characters and copy and pasting in file editor. +* Mon Jun 07 2021 Josh Boudreau 0.4.2-1 +- Implement list view. +- Fix opening symlinks to files for editing. +* Mon Jun 07 2021 Josh Boudreau 0.4.1-1 +- Use smaller chunk size while uploading for older versions of Cockpit. +* Mon Jun 07 2021 Josh Boudreau 0.4.0-1 +- Add icons to right click menu. +- Add ability to download files and directories. +- Show transfer rate and ETA while uploading files. +* Thu Jun 03 2021 Josh Boudreau 0.3.0-1 +- Add drag and drop uploading of files. +- Add event listeners for ctrl+a to select all, ctrl+x to cut, + ctrl+c to copy, ctrl+v to paste, and delete to remove a file. +* Wed Jun 02 2021 Josh Boudreau 0.2.3-1 +- Fix closing contextmenu in el7. +- Hide rename in right click menu with multiple selected entries. +- Populate default link target to selected item from right click menu. +* Wed Jun 02 2021 Josh Boudreau 0.2.2-1 +- Set default value in rename prompt to current filename. +* Wed Jun 02 2021 Josh Boudreau 0.2.1-1 +- Rename "Move" to "Cut" in right click context menu. +- Improve pasting files after copying/cutting with a custom python + script to handle checking for file conflicts before calling rsync. +- Control+S saves file that's open for editing. +- Moved renaming file from properties to right click menu with prompt. +- Creating files now fails verbosely if the destination exists. +* Tue Jun 01 2021 Josh Boudreau 0.2.0-1 +- Allow for batch editing permissions and deletion by + holding shift or control while clicking to select multiple + entries. +- Add custom right click menu. +* Fri May 28 2021 Josh Boudreau 0.1.0-1 +- First Build \ No newline at end of file diff --git a/packaging/el8/main.spec b/packaging/el8/main.spec index 68b3817..cdf5fc9 100644 --- a/packaging/el8/main.spec +++ b/packaging/el8/main.spec @@ -34,8 +34,6 @@ rm -rf %{buildroot} %changelog * Wed Jul 07 2021 Josh Boudreau 0.4.6-3 - Add relase for el7 -* Wed Jul 07 2021 Josh Boudreau 0.4.6-3 -- Add relase for el7 * Wed Jun 30 2021 Josh Boudreau 0.4.6-2 - First build with auto packaging * Fri Jun 18 2021 Josh Boudreau 0.4.6-1 From 79639ab96fcb4d482f31a2efb7f8e50410272529 Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Wed, 7 Jul 2021 15:33:01 -0300 Subject: [PATCH 5/6] remove typo in make target --- makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile b/makefile index 5628621..856ce18 100644 --- a/makefile +++ b/makefile @@ -33,5 +33,5 @@ install-local: cp -rpf navigator $(HOME)/.local/share/cockpit sed -i "s#\"/usr/share/\(cockpit/navigator/scripts/.*\)\"#\"$(HOME)/.local/share/\1\"#g" $(HOME)/.local/share/cockpit/navigator/navigator.js -make uninstall-local: +uninstall-local: rm -rf $(HOME)/.local/share/cockpit/navigator From 425dbe644e4aa2626c88841309d78cfd1ea68a1b Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Wed, 7 Jul 2021 15:47:23 -0300 Subject: [PATCH 6/6] alias python to python3 --- packaging/el7/main.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/el7/main.spec b/packaging/el7/main.spec index cdf5fc9..eea03c7 100644 --- a/packaging/el7/main.spec +++ b/packaging/el7/main.spec @@ -18,6 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %prep %setup -q +alias python=python3 %build # empty