diff --git a/src/install.sh b/src/install.sh old mode 100644 new mode 100755 index f4a77da..4123fd7 --- a/src/install.sh +++ b/src/install.sh @@ -7,11 +7,12 @@ WEB_DIR="/var/www" BIN_TARGET="/usr/local/bin/usb-bind-wrapper.sh" SUDOERS_FILE="/etc/sudoers.d/010_www-data-nopasswd" HEADER_FILE="/var/www/header.php" +SCRIPT_TAG='' echo "== Installation du plugin ==" -cp -r "$SRC_DIR/js" "$WEB_DIR/js" -cp "$SRC_DIR/usb-toogle.php" "$WEB_DIR/" +cp "$SRC_DIR/js/usb-toggle.js" "$WEB_DIR/js/usb-toggle.js" +cp "$SRC_DIR/usb-toggle.php" "$WEB_DIR/" # 2. Installer le script dans /usr/local/bin echo "-- Installation du wrapper USB" @@ -42,22 +43,21 @@ if [ ! -f "$HEADER_FILE" ]; then exit 1 fi -# Vérifier si déjà présent if grep -q 'usb-toggle.js' "$HEADER_FILE"; then echo "Script déjà présent, on skip" else TMP_FILE=$(mktemp) - + sudo mv "$HEADER_FILE" "${HEADER_FILE}.origin" awk -v script="$SCRIPT_TAG" ' - { - # On injecte juste avant - if ($0 ~ /<\/head>/) { - print " " script - } - print - }' "$HEADER_FILE" > "$TMP_FILE" + !done && $0 ~ /<\/head>/ { + print " " script + done=1 + } + { print } + ' "${HEADER_FILE}.origin" > "$TMP_FILE" + + sudo mv "$TMP_FILE" "$HEADER_FILE" && chmod 755 "$HEADER_FILE" - sudo mv "$TMP_FILE" "$HEADER_FILE" echo "Script injecté avec succès" fi diff --git a/src/js/usb-toogle.js b/src/js/usb-toggle.js similarity index 100% rename from src/js/usb-toogle.js rename to src/js/usb-toggle.js diff --git a/src/uninstall.sh b/src/uninstall.sh old mode 100644 new mode 100755 index 73c530c..941bb2a --- a/src/uninstall.sh +++ b/src/uninstall.sh @@ -10,7 +10,7 @@ BIN_TARGET="/usr/local/bin/usb-bind-wrapper.sh" # 1. Supprimer fichiers web echo "-- Remove web files" -rm -f "$WEB_DIR/usb-toogle.php" +rm -f "$WEB_DIR/usb-toggle.php" rm -rf "$WEB_DIR/js/usb-toggle.js" sudo rm -f "$BIN_TARGET" @@ -19,10 +19,8 @@ echo "-- Cleaning header.php" if grep -q 'usb-toggle.js' "$HEADER_FILE"; then TMP=$(mktemp) - grep -v 'usb-toggle.js' "$HEADER_FILE" > "$TMP" - - sudo mv "$TMP" "$HEADER_FILE" + sudo mv "$TMP" "$HEADER_FILE" && chmod 755 "$HEADER_FILE" echo "JS reference removed" else echo "No JS reference found" diff --git a/src/usb-toogle.php b/src/usb-toggle.php old mode 100644 new mode 100755 similarity index 100% rename from src/usb-toogle.php rename to src/usb-toggle.php