Skip to content

Commit ae5484f

Browse files
author
Jorrit Poelen
committed
propagate rpm changed provided by @alexlancaster
1 parent ed9e3e4 commit ae5484f

File tree

2 files changed

+50
-38
lines changed

2 files changed

+50
-38
lines changed

nomer/pom.xml

Lines changed: 50 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<asciidoctorj.version>2.5.3</asciidoctorj.version>
1919
<generated.docs.dir>${project.build.outputDirectory}/org/globalbioticinteractions/nomer/docs
2020
</generated.docs.dir>
21+
<cmd.class>org.globalbioticinteractions.nomer.Nomer</cmd.class>
2122
</properties>
2223

2324
<dependencies>
@@ -127,23 +128,44 @@
127128
<version>1.2.1</version>
128129
<executions>
129130
<execution>
131+
<id>generate-manpages</id>
130132
<phase>process-classes</phase>
131133
<goals>
132134
<goal>exec</goal>
133135
</goals>
136+
<configuration>
137+
<executable>java</executable>
138+
<arguments>
139+
<argument>-classpath</argument>
140+
<classpath/>
141+
<argument>${cmd.class}</argument>
142+
<argument>gen-manpage</argument>
143+
<argument>--outdir</argument>
144+
<argument>${generated.docs.dir}/adoc</argument>
145+
</arguments>
146+
</configuration>
147+
</execution>
148+
<execution>
149+
<id>generate-completion</id>
150+
<phase>process-classes</phase>
151+
<goals>
152+
<goal>exec</goal>
153+
</goals>
154+
<configuration>
155+
<executable>java</executable>
156+
<arguments>
157+
<argument>-Dpicocli.autocomplete.systemExitOnError</argument>
158+
<argument>-cp</argument>
159+
<classpath/>
160+
<argument>picocli.AutoComplete</argument>
161+
<argument>--force</argument><!-- overwrite if exists -->
162+
<argument>--completionScript</argument>
163+
<argument>${project.build.directory}/${project.artifactId}_completion</argument>
164+
<argument>${cmd.class}</argument>
165+
</arguments>
166+
</configuration>
134167
</execution>
135168
</executions>
136-
<configuration>
137-
<executable>java</executable>
138-
<arguments>
139-
<argument>-classpath</argument>
140-
<classpath/>
141-
<argument>org.globalbioticinteractions.nomer.Nomer</argument>
142-
<argument>gen-manpage</argument>
143-
<argument>--outdir</argument>
144-
<argument>${generated.docs.dir}/adoc</argument>
145-
</arguments>
146-
</configuration>
147169
</plugin>
148170
<plugin>
149171
<groupId>org.asciidoctor</groupId>
@@ -300,6 +322,10 @@
300322
<defineStatements>
301323
<defineStatement>_unpackaged_files_terminate_build 0</defineStatement>
302324
</defineStatements>
325+
<requires>
326+
<require>java-headless >= 1.8</require>
327+
<require>bash-completion</require>
328+
</requires>
303329
<mappings>
304330
<mapping>
305331
<directory>/opt/${project.artifactId}/lib</directory>
@@ -341,12 +367,20 @@
341367
</source>
342368
</sources>
343369
</mapping>
370+
<mapping>
371+
<directory>/usr/share/bash-completion/completions</directory>
372+
<directoryIncluded>false</directoryIncluded>
373+
<filemode>644</filemode>
374+
<username>root</username>
375+
<groupname>root</groupname>
376+
<sources>
377+
<source>
378+
<location>target/${project.artifactId}_completion</location>
379+
<destination>${project.artifactId}</destination>
380+
</source>
381+
</sources>
382+
</mapping>
344383
</mappings>
345-
<preinstallScriptlet>
346-
<scriptFile>src/main/rpm/preinstall.sh</scriptFile>
347-
<fileEncoding>utf-8</fileEncoding>
348-
<filter>true</filter>
349-
</preinstallScriptlet>
350384
</configuration>
351385
</execution>
352386
</executions>

nomer/src/main/rpm/preinstall.sh

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)