fixes #52

cryptomator · Nov 27, 2024 · 8e18943 · 8e18943
1 parent e580233
commit 8e18943
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 2 deletions.
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
@@ -74,7 +74,6 @@ jobs:
         run: mvn -B clean package -DskipTests
       - name: Patch target dir
         run: |
-          cp LICENSE.txt target
           cp target/cryptomator-*.jar target/mods
       - name: Run jlink
         run: |
@@ -88,6 +87,10 @@ jobs:
           JP_APP_VERSION: ${{ needs.prepare.outputs.semVerNum }}
           APP_VERSION: ${{ needs.prepare.outputs.semVerStr }}
           NATIVE_ACCESS_PACKAGE: ${{ matrix.native-access-lib }}
+      - name: Update app dir
+        run: |
+          cp LICENSE.txt target/cryptomator-cli
+          cp target/cryptomator-cli_completion.sh target/cryptomator-cli
       - uses: actions/upload-artifact@v4
         with:
           name: cryptomator-cli-linux-${{ matrix.architecture }}

diff --git a/.github/workflows/build-mac.yml b/.github/workflows/build-mac.yml
@@ -84,7 +84,6 @@ jobs:
         run: mvn -B clean package -DskipTests
       - name: Patch target dir
         run: |
-          cp LICENSE.txt target
           cp target/cryptomator-*.jar target/mods
       - name: Run jlink
         run: |
@@ -100,6 +99,8 @@ jobs:
           NATIVE_ACCESS_PACKAGE: org.cryptomator.jfuse.mac
       - name: Patch .app dir
         run: |
+          cp LICENSE.txt target/cryptomator-cli.app
+          cp target/cryptomator-cli_completion.sh target/cryptomator-cli.app
           sed -i '' "s|###BUNDLE_SHORT_VERSION_STRING###|${VERSION_NO}|g" cryptomator-cli.app/Contents/Info.plist
           sed -i '' "s|###BUNDLE_VERSION###|${REVISION_NO}|g" cryptomator-cli.app/Contents/Info.plist
           echo -n "$PROVISIONING_PROFILE_BASE64" | base64 --decode -o "cryptomator-cli.app/Contents/embedded.provisionprofile"

diff --git a/.github/workflows/build-win.yml b/.github/workflows/build-win.yml
@@ -78,6 +78,10 @@ jobs:
           JP_APP_VERSION: ${{ needs.prepare.outputs.semVerNum }}
           APP_VERSION: ${{ needs.prepare.outputs.semVerStr }}
           NATIVE_ACCESS_PACKAGE: org.cryptomator.jfuse.win
+      - name: Update app dir
+        run: |
+          cp LICENSE.txt target/cryptomator-cli
+          cp target/cryptomator-cli_completion.sh target/cryptomator-cli
       - name: Fix permissions
         run: attrib -r target/cryptomator-cli/cryptomator-cli.exe
         shell: pwsh

diff --git a/pom.xml b/pom.xml
@@ -173,6 +173,33 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId>
+				<version>${maven-exec.version}</version>
+				<executions>
+					<execution>
+						<id>generate-autocompletion-script</id>
+						<phase>package</phase>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<executable>java</executable>
+					<arguments>
+						<argument>-Dpicocli.autocomplete.systemExitOnError</argument>
+						<argument>-cp</argument>
+						<classpath/>
+						<argument>picocli.AutoComplete</argument>
+						<argument>--force</argument>
+						<argument>--completionScript</argument>
+						<argument>${project.build.directory}/cryptomator-cli_completion.sh</argument>
+						<argument>${mainClass}</argument>
+					</arguments>
+				</configuration>
+			</plugin>
 			<!--plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>license-maven-plugin</artifactId>