Fix sed command during EL7 packaging

CHANGELOG.md

@@ -1,4 +1,3 @@
-## Cockpit Navigator 0.5.5-1
+## Cockpit Navigator 0.5.5-2
 
-* Fix maintaining file permissions and ownership after editing file.
-* Add file upload button to top bar.
+* Fix sed command for packaging EL7.

README.md

@@ -23,12 +23,12 @@ With no command line use needed, you can:
 # Installation
 ## From Github Release
 ### Ubuntu
-1. `$ wget https://github.com/45Drives/cockpit-navigator/releases/download/v0.5.5/cockpit-navigator_0.5.5-1focal_all.deb`
-1. `# apt install ./cockpit-navigator_0.5.5-1focal_all.deb`
+1. `$ wget https://github.com/45Drives/cockpit-navigator/releases/download/v0.5.5/cockpit-navigator_0.5.5-2focal_all.deb`
+1. `# apt install ./cockpit-navigator_0.5.5-2focal_all.deb`
 ### EL7
-1. `# yum install https://github.com/45Drives/cockpit-navigator/releases/download/v0.5.5/cockpit-navigator-0.5.5-1.el7.noarch.rpm`
+1. `# yum install https://github.com/45Drives/cockpit-navigator/releases/download/v0.5.5/cockpit-navigator-0.5.5-2.el7.noarch.rpm`
 ### EL8
-1. `# dnf install https://github.com/45Drives/cockpit-navigator/releases/download/v0.5.5/cockpit-navigator-0.5.5-1.el8.noarch.rpm`
+1. `# dnf install https://github.com/45Drives/cockpit-navigator/releases/download/v0.5.5/cockpit-navigator-0.5.5-2.el8.noarch.rpm`
 ## From Source
 1. Ensure dependencies are installed: `cockpit`, `python3`, `rsync`, `zip`.
 1. `$ git clone https://github.com/45Drives/cockpit-navigator.git`

makefile

@@ -24,7 +24,7 @@ install:
 	mkdir -p $(DESTDIR)/usr/share/cockpit/
 	cp -rpf navigator $(DESTDIR)/usr/share/cockpit
 ifeq ($(DIST),$(EL7_DIST))
-	sed -i "s/pf-c-button/btn/g;s/pf-m-primary/btn-primary/g;s/pf-m-secondary/btn-default/g;s/pf-m-danger/btn-danger/g" $(DESTDIR)/usr/share/cockpit/navigator/navigator.html
+	sed -i "s/pf-c-button/btn/g;s/pf-m-primary/btn-primary/g;s/pf-m-secondary/btn-default/g;s/pf-m-danger/btn-danger/g" $(DESTDIR)/usr/share/cockpit/navigator/index.html
 	sed -i "s/pf-c-button/btn/g;s/pf-m-primary/btn-primary/g;s/pf-m-secondary/btn-default/g;s/pf-m-danger/btn-danger/g" $(DESTDIR)/usr/share/cockpit/navigator/components/ModalPrompt.js
 endif
 ifneq ($(NAV_VERS),)

manifest.json

@@ -4,7 +4,7 @@
     "title": "Cockpit Navigator",
     "prerelease": false,
     "version": "0.5.5",
-    "buildVersion": "1",
+    "buildVersion": "2",
     "author": "Josh Boudreau <jboudreau@45drives.com>",
     "url": "https://github.com/45Drives/cockpit-navigator",
     "category": "utils",
@@ -55,7 +55,7 @@
     "changelog": {
         "urgency": "medium",
         "version": "0.5.5",
-        "buildVersion": "1",
+        "buildVersion": "2",
         "ignore": [],
         "date": null,
         "packager": "Josh Boudreau <jboudreau@45drives.com>",

packaging/el7/main.spec

@@ -32,6 +32,8 @@ rm -rf %{buildroot}
 /usr/share/cockpit/navigator/*
 
 %changelog
+* Mon Oct 04 2021 Joshua Boudreau <jboudreau@45drives.com> 0.5.5-2
+- Fix sed command for packaging EL7.
 * Mon Oct 04 2021 Joshua Boudreau <jboudreau@45drives.com> 0.5.5-1
 - Fix maintaining file permissions and ownership after editing file.
 - Add file upload button to top bar.

packaging/el8/main.spec

@@ -32,6 +32,8 @@ rm -rf %{buildroot}
 /usr/share/cockpit/navigator/*
 
 %changelog
+* Mon Oct 04 2021 Joshua Boudreau <jboudreau@45drives.com> 0.5.5-2
+- Fix sed command for packaging EL7.
 * Mon Oct 04 2021 Joshua Boudreau <jboudreau@45drives.com> 0.5.5-1
 - Fix maintaining file permissions and ownership after editing file.
 - Add file upload button to top bar.

packaging/focal/changelog

@@ -1,3 +1,9 @@
+cockpit-navigator (0.5.5-2focal) focal; urgency=medium
+
+  * Fix sed command for packaging EL7.
+
+ -- Joshua Boudreau <jboudreau@45drives.com>  Mon, 04 Oct 2021 11:27:55 -0300
+
 cockpit-navigator (0.5.5-1focal) focal; urgency=medium
 
   * Fix maintaining file permissions and ownership after editing file.