Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Simplified Agent Installer #4

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
+16 −2
Open

WIP: Simplified Agent Installer #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/components/modals/agents/AgentDownload.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
Download the agent then run the following command from an elevated
command prompt on the device you want to add.
</p>
<p v-else-if="info.plat === 'darwin'" class="text-subtitle1">
<p v-else-if="info.plat === 'darwin' || info.plat === 'linux'" class="text-subtitle1">
Run the following command from a terminal
</p>
<p>
Expand All @@ -23,6 +23,7 @@
</q-field>
</p>
<q-expansion-item
v-if="info.plat === 'darwin' || info.plat === 'windows'"
switch-toggle-side
header-class="text-primary"
expand-separator
Expand Down
15 changes: 14 additions & 1 deletion src/components/modals/agents/InstallAgent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,18 @@
v-show="agentOS === 'windows'"
label="Manual"
/>
<q-radio
v-model="installMethod"
val="bash"
v-show="agentOS === 'linux'"
label="Download Script"
/>
<q-radio
v-model="installMethod"
val="bash-manual"
v-show="agentOS === 'linux'"
label="Manual"
/>
</div>
</q-card-section>
<q-card-actions align="left">
Expand Down Expand Up @@ -275,7 +287,7 @@ export default {
plat: this.agentOS,
};

if (this.installMethod === "manual" || this.installMethod === "mac") {
if (this.installMethod === "manual" || this.installMethod === "mac" || this.installMethod === "bash-manual") {
this.$axios.post("/agents/installer/", data).then((r) => {
this.info = {
expires: this.expires,
Expand Down Expand Up @@ -353,6 +365,7 @@ export default {
case "bash":
text = "Download linux install script";
break;
case "bash-manual":
case "mac":
text = "Show installation instructions";
break;
Expand Down