Merge branch 'dev-josh'

CHANGELOG.md

@@ -1,3 +1,3 @@
-## Cockpit Navigator 0.4.6-2
+## Cockpit Navigator 0.4.6-3
 
-* First build with auto packaging
+* Add relase for el7

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:
@@ -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 <version>` (v0.4 is latest)
+1. `$ git checkout <version>` (v0.4.6 is latest)
 1. `# make install`
 ## From 45Drives Repositories
 ### Ubuntu

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

manifest.json

@@ -4,7 +4,7 @@
     "title": "Cockpit Navigator",
     "prerelease": false,
     "version": "0.4.6",
-    "buildVersion": "2",
+    "buildVersion": "3",
     "author": "Josh Boudreau <jboudreau@45drives.com>",
     "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 <jboudreau@45drives.com>",

packaging/el7

@@ -1 +0,0 @@
-el8

packaging/el7/main.spec

@@ -0,0 +1,85 @@
+%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
+alias python=python3
+
+%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 <jboudreau@45drives.com> 0.4.6-3
+- Add relase for el7
+* Wed Jun 30 2021 Josh Boudreau <jboudreau@45drives.com> 0.4.6-2
+- First build with auto packaging
+* Fri Jun 18 2021 Josh Boudreau <jboudreau@45drives.com> 0.4.6-1
+- Disable navigation buttons when invalid.
+* Thu Jun 17 2021 Josh Boudreau <jboudreau@45drives.com> 0.4.5-1
+- Fix downloading a single file when the contextmenu
+  event target is not the file.
+* Thu Jun 10 2021 Josh Boudreau <jboudreau@45drives.com> 0.4.4-1
+- Hide download option in right click context menu when no items
+  are explicitly selected.
+* Tue Jun 08 2021 Josh Boudreau <jboudreau@45drives.com> 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 <jboudreau@45drives.com> 0.4.2-1
+- Implement list view.
+- Fix opening symlinks to files for editing.
+* Mon Jun 07 2021 Josh Boudreau <jboudreau@45drives.com> 0.4.1-1
+- Use smaller chunk size while uploading for older versions of Cockpit.
+* Mon Jun 07 2021 Josh Boudreau <jboudreau@45drives.com> 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 <jboudreau@45drives.com> 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 <jboudreau@45drives.com> 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 <jboudreau@45drives.com> 0.2.2-1
+- Set default value in rename prompt to current filename.
+* Wed Jun 02 2021 Josh Boudreau <jboudreau@45drives.com> 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 <jboudreau@45drives.com> 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 <jboudreau@45drives.com> 0.1.0-1
+- First Build

packaging/el8/main.spec

@@ -1,3 +1,5 @@
+%global debug_package %{nil}
+
 Name: ::package_name::
 Version: ::package_version::
 Release: ::package_build_version::%{?dist}
@@ -30,6 +32,8 @@ rm -rf %{buildroot}
 /usr/share/cockpit/navigator/*
 
 %changelog
+* Wed Jul 07 2021 Josh Boudreau <jboudreau@45drives.com> 0.4.6-3
+- Add relase for el7
 * Wed Jun 30 2021 Josh Boudreau <jboudreau@45drives.com> 0.4.6-2
 - First build with auto packaging
 * Fri Jun 18 2021 Josh Boudreau <jboudreau@45drives.com> 0.4.6-1

packaging/focal/changelog

@@ -1,3 +1,9 @@
+cockpit-navigator (0.4.6-3focal) focal; urgency=medium
+
+  * Add relase for el7
+
+ -- Josh Boudreau <jboudreau@45drives.com>  Wed, 07 Jul 2021 12:19:39 -0300
+
 cockpit-navigator (0.4.6-2focal) focal; urgency=medium
 
   * First build with auto packaging