From 36317fec3fc193533b8cf3eb17f2ef7d4ab17a3a Mon Sep 17 00:00:00 2001 From: duard Date: Wed, 12 Jun 2024 16:57:54 +0200 Subject: [PATCH 1/4] Make 1password-cli as optional install --- install/optional/app-1password-cli.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 install/optional/app-1password-cli.sh diff --git a/install/optional/app-1password-cli.sh b/install/optional/app-1password-cli.sh new file mode 100644 index 0000000..ab0de4a --- /dev/null +++ b/install/optional/app-1password-cli.sh @@ -0,0 +1,11 @@ +curl -sS https://downloads.1password.com/linux/keys/1password.asc | \ +sudo gpg --dearmor --output /usr/share/keyrings/1password-archive-keyring.gpg +echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/1password-archive-keyring.gpg] https://downloads.1password.com/linux/debian/$(dpkg --print-architecture) stable main" | +sudo tee /etc/apt/sources.list.d/1password.list +sudo mkdir -p /etc/debsig/policies/AC2D62742012EA22/ +curl -sS https://downloads.1password.com/linux/debian/debsig/1password.pol | \ +sudo tee /etc/debsig/policies/AC2D62742012EA22/1password.pol +sudo mkdir -p /usr/share/debsig/keyrings/AC2D62742012EA22 +curl -sS https://downloads.1password.com/linux/keys/1password.asc | \ +sudo gpg --dearmor --output /usr/share/debsig/keyrings/AC2D62742012EA22/debsig.gpg +sudo apt install -y 1password-cli \ No newline at end of file From 15d8dc404af385ca9d503c9f6d23d76bc881d435 Mon Sep 17 00:00:00 2001 From: duard Date: Thu, 13 Jun 2024 08:50:12 +0200 Subject: [PATCH 2/4] Include 1password-cli as optional installation and its uninstall script --- install/select-optional-apps.sh | 2 +- uninstall/app-1password-cli.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 uninstall/app-1password-cli.sh diff --git a/install/select-optional-apps.sh b/install/select-optional-apps.sh index b18dc1d..0e8b03e 100644 --- a/install/select-optional-apps.sh +++ b/install/select-optional-apps.sh @@ -1,5 +1,5 @@ # Install optional apps -apps=$(gum choose "1password" "Spotify" "Zoom" "Dropbox" "VirtualBox" --no-limit --selected "1password","Spotify","Zoom" --height 7 --header "Select commercial apps") +apps=$(gum choose "1password" "1password-cli" "Spotify" "Zoom" "Dropbox" "VirtualBox" --no-limit --selected "1password","1password-cli","Spotify","Zoom" --height 7 --header "Select commercial apps") for app in $apps; do source "$OMAKUB_PATH/install/optional/app-${app,,}.sh" diff --git a/uninstall/app-1password-cli.sh b/uninstall/app-1password-cli.sh new file mode 100644 index 0000000..e739dc4 --- /dev/null +++ b/uninstall/app-1password-cli.sh @@ -0,0 +1 @@ +sudo apt remove -y 1password-cli From e22cca9179d9fa74487bcd62461f65ed9fbd2944 Mon Sep 17 00:00:00 2001 From: Eduard Garcia Date: Thu, 13 Jun 2024 13:33:34 +0200 Subject: [PATCH 3/4] Merge 1password and its cli on the same installation script --- install/optional/app-1password-cli.sh | 11 ----------- install/optional/app-1password.sh | 12 ++++++++++++ install/select-optional-apps.sh | 2 +- uninstall/app-1password.sh | 2 +- 4 files changed, 14 insertions(+), 13 deletions(-) delete mode 100644 install/optional/app-1password-cli.sh diff --git a/install/optional/app-1password-cli.sh b/install/optional/app-1password-cli.sh deleted file mode 100644 index ab0de4a..0000000 --- a/install/optional/app-1password-cli.sh +++ /dev/null @@ -1,11 +0,0 @@ -curl -sS https://downloads.1password.com/linux/keys/1password.asc | \ -sudo gpg --dearmor --output /usr/share/keyrings/1password-archive-keyring.gpg -echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/1password-archive-keyring.gpg] https://downloads.1password.com/linux/debian/$(dpkg --print-architecture) stable main" | -sudo tee /etc/apt/sources.list.d/1password.list -sudo mkdir -p /etc/debsig/policies/AC2D62742012EA22/ -curl -sS https://downloads.1password.com/linux/debian/debsig/1password.pol | \ -sudo tee /etc/debsig/policies/AC2D62742012EA22/1password.pol -sudo mkdir -p /usr/share/debsig/keyrings/AC2D62742012EA22 -curl -sS https://downloads.1password.com/linux/keys/1password.asc | \ -sudo gpg --dearmor --output /usr/share/debsig/keyrings/AC2D62742012EA22/debsig.gpg -sudo apt install -y 1password-cli \ No newline at end of file diff --git a/install/optional/app-1password.sh b/install/optional/app-1password.sh index 2a8fbf3..3bb371c 100644 --- a/install/optional/app-1password.sh +++ b/install/optional/app-1password.sh @@ -3,3 +3,15 @@ wget https://downloads.1password.com/linux/debian/amd64/stable/1password-latest. sudo apt install -y ./1password-latest.deb rm 1password-latest.deb cd - +# Install 1password-cli +curl -sS https://downloads.1password.com/linux/keys/1password.asc | \ +sudo gpg --dearmor --output /usr/share/keyrings/1password-archive-keyring.gpg +echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/1password-archive-keyring.gpg] https://downloads.1password.com/linux/debian/$(dpkg --print-architecture) stable main" | +sudo tee /etc/apt/sources.list.d/1password.list +sudo mkdir -p /etc/debsig/policies/AC2D62742012EA22/ +curl -sS https://downloads.1password.com/linux/debian/debsig/1password.pol | \ +sudo tee /etc/debsig/policies/AC2D62742012EA22/1password.pol +sudo mkdir -p /usr/share/debsig/keyrings/AC2D62742012EA22 +curl -sS https://downloads.1password.com/linux/keys/1password.asc | \ +sudo gpg --dearmor --output /usr/share/debsig/keyrings/AC2D62742012EA22/debsig.gpg +sudo apt install -y 1password-cli \ No newline at end of file diff --git a/install/select-optional-apps.sh b/install/select-optional-apps.sh index 0e8b03e..b18dc1d 100644 --- a/install/select-optional-apps.sh +++ b/install/select-optional-apps.sh @@ -1,5 +1,5 @@ # Install optional apps -apps=$(gum choose "1password" "1password-cli" "Spotify" "Zoom" "Dropbox" "VirtualBox" --no-limit --selected "1password","1password-cli","Spotify","Zoom" --height 7 --header "Select commercial apps") +apps=$(gum choose "1password" "Spotify" "Zoom" "Dropbox" "VirtualBox" --no-limit --selected "1password","Spotify","Zoom" --height 7 --header "Select commercial apps") for app in $apps; do source "$OMAKUB_PATH/install/optional/app-${app,,}.sh" diff --git a/uninstall/app-1password.sh b/uninstall/app-1password.sh index d033c51..813692c 100644 --- a/uninstall/app-1password.sh +++ b/uninstall/app-1password.sh @@ -1 +1 @@ -sudo apt remove -y 1password +sudo apt remove -y 1password 1password-cli From a1d1d4dce234c4a2b5f5093eea78e7d24686bc57 Mon Sep 17 00:00:00 2001 From: Eduard Garcia Date: Thu, 13 Jun 2024 16:44:40 +0200 Subject: [PATCH 4/4] Merge 1password and its cli on the same installation script --- install/optional/app-1password.sh | 15 ++++++++------- uninstall/app-1password-cli.sh | 1 - 2 files changed, 8 insertions(+), 8 deletions(-) mode change 100644 => 100755 install/optional/app-1password.sh delete mode 100644 uninstall/app-1password-cli.sh diff --git a/install/optional/app-1password.sh b/install/optional/app-1password.sh old mode 100644 new mode 100755 index 3bb371c..1164336 --- a/install/optional/app-1password.sh +++ b/install/optional/app-1password.sh @@ -1,17 +1,18 @@ -cd /tmp -wget https://downloads.1password.com/linux/debian/amd64/stable/1password-latest.deb -sudo apt install -y ./1password-latest.deb -rm 1password-latest.deb -cd - -# Install 1password-cli +# Install 1password and 1password-cli single script curl -sS https://downloads.1password.com/linux/keys/1password.asc | \ sudo gpg --dearmor --output /usr/share/keyrings/1password-archive-keyring.gpg + +# Add apt repository echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/1password-archive-keyring.gpg] https://downloads.1password.com/linux/debian/$(dpkg --print-architecture) stable main" | sudo tee /etc/apt/sources.list.d/1password.list + +# Add the debsig-verify policy sudo mkdir -p /etc/debsig/policies/AC2D62742012EA22/ curl -sS https://downloads.1password.com/linux/debian/debsig/1password.pol | \ sudo tee /etc/debsig/policies/AC2D62742012EA22/1password.pol sudo mkdir -p /usr/share/debsig/keyrings/AC2D62742012EA22 curl -sS https://downloads.1password.com/linux/keys/1password.asc | \ sudo gpg --dearmor --output /usr/share/debsig/keyrings/AC2D62742012EA22/debsig.gpg -sudo apt install -y 1password-cli \ No newline at end of file + +# Install 1Password & 1password-cli +sudo apt install -y 1password 1password-cli \ No newline at end of file diff --git a/uninstall/app-1password-cli.sh b/uninstall/app-1password-cli.sh deleted file mode 100644 index e739dc4..0000000 --- a/uninstall/app-1password-cli.sh +++ /dev/null @@ -1 +0,0 @@ -sudo apt remove -y 1password-cli