update COGNAC

Signed-off-by: Matthias Gatto <[email protected]>
outscale · Oct 28, 2024 · 4b30eae · 4b30eae
1 parent b62a7ac
commit 4b30eae
Show file tree

Hide file tree

Showing 8 changed files with 9,942 additions and 9,941 deletions.
diff --git a/oapi-cli.AppDir/AppRun → AppRun b/oapi-cli.AppDir/AppRun → AppRun
@@ -2,15 +2,11 @@
 
 for opt in "$@"; do
     if [ "${opt}" == "--bash-completion" ]; then
-	cat "${APPDIR}/usr/bin/oapi-cli-completion.bash"
+	cat "${APPDIR}/usr/bin/____cli_name____-completion.bash"
         exit 0
     fi
 done
 
-if [ -z "$CURL_CA_BUNDLE" ]; then
-    source ${APPDIR}/import-ssl.sh
-fi
-
 export COGNAC_HELP_APPEND="$(echo -en '\t--bash-completion\tprint bash completion(appimage only)\n\t--appimage-help\t\tappimage helps')"
 
-LD_LIBRARY_PATH=${APPDIR}/usr/lib/ "${APPDIR}/usr/bin/oapi-cli" "$@"
+LD_LIBRARY_PATH=${APPDIR}/usr/lib/ "${APPDIR}/usr/bin/____cli_name____" "$@"
diff --git a/COGNAC b/COGNAC
diff --git a/Makefile b/Makefile
@@ -5,6 +5,7 @@ JSON_C_RULE=./json-c-build/libjson-c.a
 API_RULE_DEPEDENCIES=
 OAPI_APPIMAGE_RULE_DEPEDENCIES=
 APPIMAGETOOL_OPTION=
+CLI_NAME=oapi-cli
 
 include config.mk
 include COGNAC/oapi-cli.mk
@@ -33,7 +34,7 @@ osc_sdk.h: osc-sdk-C/osc_sdk.h
 osc_sdk.c: osc-sdk-C/osc_sdk.c
 	cp osc-sdk-C/osc_sdk.c .
 
-oapi-cli-completion.bash: COGNAC/main.c
+$(CLI_NAME)-completion.bash:
 	cp COGNAC/oapi-cli-completion.bash .
 
 gen: main.c osc_sdk.h osc_sdk.c oapi-cli-completion.bash main-helper.h

diff --git a/oapi-cli.AppDir/appimage-logo.png → appimage-logo.png b/oapi-cli.AppDir/appimage-logo.png → appimage-logo.png
diff --git a/oapi-cli.AppDir/oapi-cli.desktop → cli.desktop b/oapi-cli.AppDir/oapi-cli.desktop → cli.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
-Name=oapi-cli
-Exec=oapi-cli
+Name=____cli_name____
+Exec=____cli_name____
 Comment=CLI-of Outscale Granting Net Accessible Calls
 Categories=Development;Network;
 Terminal=true

diff --git a/main-helper.h b/main-helper.h
@@ -42,6 +42,9 @@ struct ptr_array {
  */
 #define OBJ_SIZE 8
 
+/* a is an array with a flexible size, v is the value to push,
+ * and pa is used to store the pointer so that we can easily free everything later.
+ */
 #define SET_NEXT(a,v,pa) do {						\
 		int cnt;						\
 		if (!a) {						\
+5 −1		.github/workflows/build.yml
+2 −2		AppRun
+36 −0		HACKING.md
+15 −12		Makefile
+81 −6		README.md
+ −		appimage-logo.png
+10 −2		bin/funclist.c
+19 −0		bin/osc-api-seems-valid.sh
+2 −2		cli.desktop
+24 −8		cognac_gen.sh
+12 −0		configure
+26 −4		construct_data.c.sh
+38 −31		helper.sh
+5 −0		lib.h
+3 −0		main-helper.h
+7 −6		main_tpl.c
+7 −0		mk_args.c.sh
+4 −4		oapi-cli-completion-tpl.bash
+17 −12		oapi-cli.mk