diff --git a/undo_telemetry.sh b/undo_telemetry.sh index b5a26f9..58a88aa 100755 --- a/undo_telemetry.sh +++ b/undo_telemetry.sh @@ -3,8 +3,15 @@ TELEMETRY_URLS="(dc\.services\.visualstudio\.com)|(vortex\.data\.microsoft\.com)" REPLACEMENT="s/$TELEMETRY_URLS/0\.0\.0\.0/g" +#include common functions +. ../utils.sh + if [[ "$OS_NAME" == "osx" ]]; then - grep -rl --exclude-dir=.git -E $TELEMETRY_URLS . | xargs sed -i '' -E $REPLACEMENT + if is_gnu_sed; then + grep -rl --exclude-dir=.git -E $TELEMETRY_URLS . | xargs sed -i -E $REPLACEMENT + else + grep -rl --exclude-dir=.git -E $TELEMETRY_URLS . | xargs sed -i '' -E $REPLACEMENT + fi else grep -rl --exclude-dir=.git -E $TELEMETRY_URLS . | xargs sed -i -E $REPLACEMENT fi diff --git a/update_settings.sh b/update_settings.sh index 1a482cb..3e52a84 100755 --- a/update_settings.sh +++ b/update_settings.sh @@ -3,18 +3,8 @@ DEFAULT_FALSE="'default': false" TELEMETRY_ENABLE="'telemetry.enableTelemetry':" TELEMETRY_CRASH_REPORTER="'telemetry.enableCrashReporter':" -is_gnu_sed () { - sed --version >/dev/null 2>&1 -} - -replace () { - echo $1 - if is_gnu_sed; then - sed -i -E "$1" $2 - else - sed -i '' -E "$1" $2 - fi -} +#include common functions +. ../utils.sh update_setting () { local FILENAME="$2" diff --git a/utils.sh b/utils.sh new file mode 100755 index 0000000..b1dfae9 --- /dev/null +++ b/utils.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +#All common functions can be added to this file + +is_gnu_sed () { + sed --version >/dev/null 2>&1 +} + +replace () { + echo $1 + if is_gnu_sed; then + sed -i -E "$1" $2 + else + sed -i '' -E "$1" $2 + fi +}