Update 3 files
- /home/.chezmoiscripts/universal/run_onchange_after_07-docker-plugins.tmpl - /home/.chezmoiscripts/universal/run_onchange_after_40-firefox.tmpl - /home/dot_local/bin/executable_install-program
This commit is contained in:
parent
ea26c8038e
commit
2eead82bf1
3 changed files with 7 additions and 4 deletions
|
@ -30,8 +30,8 @@ if [ ! -d /var/lib/docker-plugins/rclone/cache ]; then
|
||||||
sudo mkdir -p /var/lib/docker-plugins/rclone/cache
|
sudo mkdir -p /var/lib/docker-plugins/rclone/cache
|
||||||
fi
|
fi
|
||||||
sudo cp -f "${XDG_CONFIG_HOME:-$HOME/.config}/rclone/docker-rclone.conf /var/lib/docker-plugins/rclone/config/rclone.conf
|
sudo cp -f "${XDG_CONFIG_HOME:-$HOME/.config}/rclone/docker-rclone.conf /var/lib/docker-plugins/rclone/config/rclone.conf
|
||||||
if ! docker plugin ls | grep 'rclone:latest' > /dev/null; then
|
if ! sudo su -c 'docker plugin ls' - "$USER" | grep 'rclone:latest' > /dev/null; then
|
||||||
docker plugin install rclone/docker-volume-rclone:amd64 args="-v" --alias rclone --grant-all-permissions
|
sudo su -c 'docker plugin install rclone/docker-volume-rclone:amd64 args="-v" --alias rclone --grant-all-permissions' - "$USER"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@ for SETTINGS_DIR in "$HOME/snap/firefox/common/.mozilla/firefox" "$HOME/.var/app
|
||||||
FIREFOX_EXE="$(which io.gitlab.librewolf-community)"
|
FIREFOX_EXE="$(which io.gitlab.librewolf-community)"
|
||||||
elif [ "$SETTINGS_DIR" == "$HOME/Library/Application Support/Firefox/Profiles" ]; then
|
elif [ "$SETTINGS_DIR" == "$HOME/Library/Application Support/Firefox/Profiles" ]; then
|
||||||
FIREFOX_EXE="/Applications/Firefox.app/Contents/MacOS/firefox"
|
FIREFOX_EXE="/Applications/Firefox.app/Contents/MacOS/firefox"
|
||||||
elif [ "$SETTINGS_DIR == "$HOME/Library/Application Support/LibreWolf/Profiles" ]; then
|
elif [ "$SETTINGS_DIR" == "$HOME/Library/Application Support/LibreWolf/Profiles" ]; then
|
||||||
FIREFOX_EXE="/Applications/LibreWolf.app/Contents/MacOS/librewolf"
|
FIREFOX_EXE="/Applications/LibreWolf.app/Contents/MacOS/librewolf"
|
||||||
elif [ "$SETTINGS_DIR" == "$HOME/snap/firefox/common/.mozilla/firefox" ]; then
|
elif [ "$SETTINGS_DIR" == "$HOME/snap/firefox/common/.mozilla/firefox" ]; then
|
||||||
FIREFOX_EXE="$(which firefox)"
|
FIREFOX_EXE="$(which firefox)"
|
||||||
|
|
|
@ -784,7 +784,7 @@ async function beforeInstall(packageManager) {
|
||||||
await $`brew install --cask docker`
|
await $`brew install --cask docker`
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
await $`docker run --rm hello-world`
|
await $`sudo -c 'docker run --rm hello-world' - ${process.env.USER}`
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
log('warn', logStage, `The command \`docker run --rm hello-world\` failed`)
|
log('warn', logStage, `The command \`docker run --rm hello-world\` failed`)
|
||||||
try {
|
try {
|
||||||
|
@ -1487,6 +1487,9 @@ async function addUserGroup(group) {
|
||||||
log('error', logStage, `The useradd command is unavailable`)
|
log('error', logStage, `The useradd command is unavailable`)
|
||||||
}
|
}
|
||||||
} else if (osType === 'darwin') {
|
} else if (osType === 'darwin') {
|
||||||
|
runCommand(`Adding the ${group} group`, `sudo dscl . -create /Users/${group}`)
|
||||||
|
runCommand(`Creating the ${group} group`, `sudo dscl . -create /Groups/${group}`)
|
||||||
|
runCommand(`Adding the ${group} user to the ${group} group`, `sudo dscl . -append /Groups/${group} GroupMembership ${group}`)
|
||||||
} else if (osType === 'windows') {
|
} else if (osType === 'windows') {
|
||||||
log('warn', logStage, `Windows support not yet added`)
|
log('warn', logStage, `Windows support not yet added`)
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in a new issue