Texte vergleichen

Finde den Unterschied zwischen zwei Textdateien

Live-Editor

Gleiches ausblenden

Zeilenumbruch aus

Ansicht

Vergleichsgenauigkeit

Syntaxhervorhebung

Diffchecker Desktop Der sicherste Weg, Diffchecker zu nutzen. Hol dir die Desktop-App: Deine Diffs verlassen nie deinen Computer!Desktop holen

Untitled diff

Erstellt vor 11 JahrenDiff läuft nie ab

4 Entfernungen

Zeilen
Gesamt
Entfernt

Zeichen
Gesamt
Entfernt

Um diese Funktion weiterhin zu nutzen, aktualisiere auf Diffchecker Pro Preise anzeigen

283 Zeilen

21 Hinzufügungen

Zeilen
Gesamt
Hinzugefügt

Zeichen
Gesamt
Hinzugefügt

Um diese Funktion weiterhin zu nutzen, aktualisiere auf Diffchecker Pro Preise anzeigen

290 Zeilen

#!/bin/bash -e

# Some colored makepkg-like functions

msg() {

printf "${green}==>${bold} $1${all_off}\n"

}

msg_yellow() {

printf "${yellow}==>${bold} $1${all_off}\n"

}

msg2() {

printf "${blue} ->${bold} $1${all_off}\n"

}

msg2_yellow() {

printf "${yellow} ->${bold} $1${all_off}\n"

}

read_msg2() {

read -p "${blue} ->${bold} $1${all_off}"

}

msg3() {

printf "${yellow} ->${bold} $1${all_off}\n"

}

error() {

printf "${red}==> error:${bold} $1${all_off}\n"

}

error2() {

printf "${red} *${bold} $1${all_off}\n"

}

# Colors

all_off="$(tput sgr0)"

bold="${all_off}$(tput bold)"

blue="${bold}$(tput setaf 4)"

green="${bold}$(tput setaf 2)"

red="${bold}$(tput setaf 1)"

yellow="${bold}$(tput setaf 3)"

# Help message

usage() {

echo "Usage: $(basename $0) [-f|-v|-V|-h]"

echo "Automate the compilation of VMware modules for Arch Linux."

echo

echo "Available options:"

echo " -f, --force Force reinstallation even, if modules already built"

echo " -v, --verbose Use verbose output (patching, vmware-modconfig)"

echo " -V, --version Print version information"

echo " -h, --help Print this help"

echo " -k <v>, --kernel=<v> Patch the specified Linux kernel version"

echo " -h, --help Print this help"

}

# Version information

version() {

echo "$(basename $0) $(pacman -Q vmware-patch | cut -d ' ' -f2)"

echo

echo "THIS SCRIPT IS PROVIDED AS-IS FOR ANY PURPOSE WHATSOEVER. YOU ARE FREE TO SHARE IT, MODIFY IT,"

echo "TAKE CREDIT OF IT, AND SELL IT ON THE STREETS."

echo

echo "FIGHT THE POWER."

}

# Flags

while [[ "$1" ]]; do

# Can't change $1

opt="$1"

# Parse current one

while [[ "$opt" != "-" ]]; do

# Define actions

case "$opt" in

-f* | --force) force=1 ;;

-v* | --verbose) verbose=1 ;;

-k) shift; kernel_version="$1" ;;

--kernel=*) kernel_version="${opt#*=}" ;;

-V* | --version) version; exit 0 ;;

-h* | --help) usage; exit 0 ;;

-*) echo "$(basename $0): error: bad argument: $opt"

echo

usage $1; exit 0 ;;

*) break ;;

esac

# Support single dash (-fv)

# Remove first match ("${opt#-[fv]}")

nextopt="${opt#-[fv]}"

if [[ "$opt" != "$nextopt" ]]; then

# Multiple short flags

opt="-$nextopt"

else

# Long form (--force/--verbose)

break

done

shift

done

# Make sure we are root

if (( $EUID != 0 )); then

error "This script needs to be run as root."

exit 1

# Is a VMware product installed?

if [[ ! -f /usr/bin/vmware-installer ]]; then

error "No VMware product found. Exiting.."

exit 1

# Set some variables (|&: hide errors by redirecting all output)

kernel=$(uname -r | cut -d "." -f-2)

if [[ -z $kernel_version ]]; then

kernel_version=$(uname -r)

[[ "$verbose" ]] && msg "Using Linux kernel $kernel_version"

kernel=$(echo $kernel_version | cut -d "." -f-2)

ver=$(vmware-installer -l |& grep -Po "(player|workstation) *\K(\d+\.){2}\d+")

if vmware-installer -l |& grep -q "workstation"; then

name="VMware Workstation"

else

name="VMware Player (Plus)"

# Make sure vmware.service includes our USB Arbitrator service

if ! grep -q "usbarbitrator" /usr/lib/systemd/system/vmware.service; then

msg "Updating vmware.service.."

sed '/Description/a Requires=vmware-usbarbitrator.service\nBefore=vmware-usbarbitrator.service' \

-i /usr/lib/systemd/system/vmware.service

# Make sure there's a version in /etc/arch-release for Workstation 9 / Player 5

# https://wiki.archlinux.org/index.php?title=VMware&oldid=274532#2.29_The_vmware-usbarbitrator_binary_is_segfaulting

if [[ "$ver" = 9.* ]] || [[ "$ver" = 5.* ]]; then

if [[ ! $(cat /etc/arch-release) ]]; then

msg "Updating /etc/arch-release.."

curl -s https://www.archlinux.org/releng/releases/ | grep -Pom1 'for \K[^"]*' > /etc/arch-release

# Fix Vmci/Vsock loading

if grep -q '$vsock_alias' /etc/init.d/vmware; then

sed -e 's/mod=$(vmwareRealModName $vmci $vmci_alias)/mod=vmci/' \

-e 's/mod=$(vmwareRealModName $vsock $vsock_alias)/mod=vsock/' \

-i /etc/init.d/vmware

# Remove leftover module locations

for i in /usr/lib/modules/*; do

if [[ $(ls "$i") = 'misc' ]]; then

misc+=("$i")

done

if [[ "$misc" ]]; then

msg_yellow "Removing leftover module location.."

for i in ${misc[@]}; do

msg2 "$i/"

rm -r "$i"

done

# Remove old backups

cd /usr/lib/vmware/modules/

# Use "ls" instead of the builtin -d for multiple arguments

if ls -d source-*.*/ 2>/dev/null | grep -qv "$ver/"; then

msg_yellow "Cleaning up old backups.."

# Print full paths

for i in $(readlink -f source-*.*/ | grep -v "$ver"); do

msg2 "$i/"

rm -r "$i"

done

# Make sure the directory exists

if [[ ! -d /usr/lib/modules/$(uname -r)/ ]]; then

if [[ ! -d /usr/lib/modules/$kernel_version/ ]]; then

error "/usr/lib/modules/$(uname -r)/ not found. Exiting.."

error "/usr/lib/modules/$kernel_version/ not found. Exiting.."

exit 1

# Support the '-f' flag

# 1) Have we already built (vsock is built last)?

# 2) Don't check this until we've removed the leftovers

if [[ ! "$force" ]] && [[ -f /usr/lib/modules/$(uname -r)/misc/vsock.ko ]]; then

if [[ ! "$force" ]] && [[ -f /usr/lib/modules/$kernel_version/misc/vsock.ko ]]; then

if [[ "$verbose" ]]; then

msg "Verifying current state.."

error "VMware modules already installed (use '-f' to override). Exiting.."

exit 1

# Unload conflicting in-kernel modules (VMware can't handle these in Arch)

if rmmod vmw_vsock_vmci_transport 2>/dev/null; then

rmmod vmw_vmci vsock 2>/dev/null

# Patch

# 1) Make sure we can build

# 2) &>/dev/null: hide all output (STDIN/STDERR)

msg "Patching $name v$ver for kernel $(uname -r).."

msg "Patching $name v$ver for kernel $kernel_version.."

if ls patches/*"$ver"*"$kernel"*.patch &>/dev/null; then

# Create a backup/Revert

if [[ ! -d "source-$ver" ]]; then

msg2_yellow "Backing up.."

cp -r source/ "source-$ver/"

else

# Get the original sources from the backup (invalidate the need for 'vmware-unpatch')

cp "source-$ver/"* source/

cd source

# Loop modules that require patching (vmci, vmmon, vmnet and/or vsock)

# sort -u: prevent duplicate entries with

for mod in $(ls ../patches/v*"$ver"*"$kernel"*.patch 2>&- | grep -Po "s/\K[^-]*" | sort -u); do

# Print name

msg2 "[$mod]"

# Untar

if [[ "$verbose" ]]; then

msg3 "Extracting archives.."

tar -xf "$mod.tar"

# Patch function

_patch() {

if [[ "$verbose" ]]; then

msg3 "Patching.."

patch -p0 -f -i "$i"

else

patch -p0 -s -f -i "$i"

}

# Loop through all patches

for i in ../patches/"$mod"*"$ver"*"$kernel"*.patch; do

# Patch

if ! _patch; then

error "Failed to apply '$(basename "$i")'"

read_msg2 "Continue? (Y/n) "

if [[ "$REPLY" != [Yy] ]]; then

# Revert

msg "Reverting.."

cd ..

rm -r source/

mv "source-$ver/" source/

# Exit

msg2 "Done."

exit 1

done

# Tar patched modules

if [[ "$verbose" ]]; then

msg3 "Recreating archives.."

tar -cf "$mod.tar" "$mod-only"

# Leftovers

rm -r "$mod-only"

done

else

msg2 "No patching required.."

# Print 'vmware-modconfig-*.log's and exit

print_logs() {

for i in /tmp/vmware-root/vmware-modconfig-*.log; do

error2 "$i"

done

exit 1

}

# Install

msg "Installing modules.."

if [[ "$verbose" ]]; then

if ! vmware-modconfig --console --install-all; then

if ! vmware-modconfig --console --install-all -k "$kernel_version"; then

error "Unable to build. See:"

print_logs

else

if ! vmware-modconfig --console --install-all &>/dev/null; then

if ! vmware-modconfig --console --install-all -k "$kernel_version" &>/dev/null; then

error "Unable to build. Re-run with '-v' (--verbose) or see:"

print_logs

msg2 "Done."

Gespeicherte Diffs

Originaltext

Datei öffnen

#!/bin/bash -e

# Some colored makepkg-like functions
msg() {
    printf "${green}==>${bold} $1${all_off}\n"
}

msg_yellow() {
    printf "${yellow}==>${bold} $1${all_off}\n"
}

msg2() {
    printf "${blue}  ->${bold} $1${all_off}\n"
}

msg2_yellow() {
    printf "${yellow}  ->${bold} $1${all_off}\n"
}

read_msg2() {
    read -p "${blue}  ->${bold} $1${all_off}"
}

msg3() {
    printf "${yellow}    ->${bold} $1${all_off}\n"
}

error() {
    printf "${red}==> error:${bold} $1${all_off}\n"
}

error2() {
    printf "${red}    *${bold} $1${all_off}\n"
}

# Colors
all_off="$(tput sgr0)"
bold="${all_off}$(tput bold)"
blue="${bold}$(tput setaf 4)"
green="${bold}$(tput setaf 2)"
red="${bold}$(tput setaf 1)"
yellow="${bold}$(tput setaf 3)"

# Help message
usage() {
    echo "Usage: $(basename $0) [-f|-v|-V|-h]"
    echo "Automate the compilation of VMware modules for Arch Linux."
    echo
    echo "Available options:"
    echo "  -f, --force       Force reinstallation even, if modules already built"
    echo "  -v, --verbose     Use verbose output (patching, vmware-modconfig)"
    echo "  -V, --version     Print version information"
    echo "  -h, --help        Print this help"
}

# Version information
version() {
    echo "$(basename $0) $(pacman -Q vmware-patch | cut -d ' ' -f2)"
    echo "Copyright (c) 2013-2014  Nobody"
    echo
    echo "THIS SCRIPT IS PROVIDED AS-IS FOR ANY PURPOSE WHATSOEVER. YOU ARE FREE TO SHARE IT, MODIFY IT,"
    echo "TAKE CREDIT OF IT, AND SELL IT ON THE STREETS."
    echo
    echo "FIGHT THE POWER."
}

# Flags
while [[ "$1" ]]; do
    # Can't change $1
    opt="$1"
    # Parse current one
    while [[ "$opt" != "-" ]]; do
        # Define actions
        case "$opt" in
            -f* | --force)     force=1 ;;
            -v* | --verbose)   verbose=1 ;;
            -V* | --version)   version; exit 0 ;;
            -h* | --help)      usage; exit 0 ;;
            -*)                echo "$(basename $0): error: bad argument: $opt"
                               echo
                               usage $1; exit 0 ;;
            *) break ;;
        esac
        # Support single dash (-fv)
        # Remove first match ("${opt#-[fv]}")
        nextopt="${opt#-[fv]}"
        if [[ "$opt" != "$nextopt" ]]; then
            # Multiple short flags
		        opt="-$nextopt"
        else
            # Long form (--force/--verbose)
            break
        fi
    done
    shift
done

# Make sure we are root
if (( $EUID != 0 )); then
    error "This script needs to be run as root."
    exit 1
fi

# Is a VMware product installed?
if [[ ! -f /usr/bin/vmware-installer ]]; then
    error "No VMware product found. Exiting.."
    exit 1
fi

# Set some variables (|&: hide errors by redirecting all output)
kernel=$(uname -r | cut -d "." -f-2)
ver=$(vmware-installer -l |& grep -Po "(player|workstation) *\K(\d+\.){2}\d+")
if vmware-installer -l |& grep -q "workstation"; then
    name="VMware Workstation"
else
    name="VMware Player (Plus)"
fi

# Make sure vmware.service includes our USB Arbitrator service
if ! grep -q "usbarbitrator" /usr/lib/systemd/system/vmware.service; then
    msg "Updating vmware.service.."
    sed '/Description/a Requires=vmware-usbarbitrator.service\nBefore=vmware-usbarbitrator.service' \
        -i /usr/lib/systemd/system/vmware.service
fi

# Make sure there's a version in /etc/arch-release for Workstation 9 / Player 5
# https://wiki.archlinux.org/index.php?title=VMware&oldid=274532#2.29_The_vmware-usbarbitrator_binary_is_segfaulting
if [[ "$ver" = 9.* ]] || [[ "$ver" = 5.* ]]; then
    if [[ ! $(cat /etc/arch-release) ]]; then
        msg "Updating /etc/arch-release.."
        curl -s https://www.archlinux.org/releng/releases/ | grep -Pom1 'for \K[^"]*' > /etc/arch-release
    fi
fi

# Fix Vmci/Vsock loading
if grep -q '$vsock_alias' /etc/init.d/vmware; then
    sed -e 's/mod=$(vmwareRealModName $vmci $vmci_alias)/mod=vmci/' \
        -e 's/mod=$(vmwareRealModName $vsock $vsock_alias)/mod=vsock/' \
        -i /etc/init.d/vmware
fi

# Remove leftover module locations
for i in /usr/lib/modules/*; do
    if [[ $(ls "$i") = 'misc' ]]; then
        misc+=("$i")
    fi
done
if [[ "$misc" ]]; then
    msg_yellow "Removing leftover module location.."
    for i in ${misc[@]}; do
        msg2 "$i/"
        rm -r "$i"
    done
fi

# Remove old backups
cd /usr/lib/vmware/modules/
# Use "ls" instead of the builtin -d for multiple arguments
if ls -d source-*.*/ 2>/dev/null | grep -qv "$ver/"; then
    msg_yellow "Cleaning up old backups.."
    # Print full paths
    for i in $(readlink -f source-*.*/ | grep -v "$ver"); do
        msg2 "$i/"
        rm -r "$i"
    done
fi

# Make sure the directory exists
if [[ ! -d /usr/lib/modules/$(uname -r)/ ]]; then
    error "/usr/lib/modules/$(uname -r)/ not found. Exiting.."
    exit 1
fi

# Support the '-f' flag
# 1) Have we already built (vsock is built last)?
# 2) Don't check this until we've removed the leftovers
if [[ ! "$force" ]] && [[ -f /usr/lib/modules/$(uname -r)/misc/vsock.ko ]]; then
    if [[ "$verbose" ]]; then
        msg "Verifying current state.."
    fi
    error "VMware modules already installed (use '-f' to override). Exiting.."
    exit 1
fi

# Unload conflicting in-kernel modules (VMware can't handle these in Arch)
if rmmod vmw_vsock_vmci_transport 2>/dev/null; then
    rmmod vmw_vmci vsock 2>/dev/null
fi

# Patch
# 1) Make sure we can build
# 2) &>/dev/null: hide all output (STDIN/STDERR)
msg "Patching $name v$ver for kernel $(uname -r).."
if ls patches/*"$ver"*"$kernel"*.patch &>/dev/null; then
    # Create a backup/Revert
    if [[ ! -d "source-$ver" ]]; then
        msg2_yellow "Backing up.."
        cp -r source/ "source-$ver/"
    else
        # Get the original sources from the backup (invalidate the need for 'vmware-unpatch')
        cp "source-$ver/"* source/
    fi

cd source
    # Loop modules that require patching (vmci, vmmon, vmnet and/or vsock)
    # sort -u: prevent duplicate entries with
    for mod in $(ls ../patches/v*"$ver"*"$kernel"*.patch 2>&- | grep -Po "s/\K[^-]*" | sort -u); do
        # Print name
        msg2 "[$mod]"

# Untar
        if [[ "$verbose" ]]; then
            msg3 "Extracting archives.."
        fi
        tar -xf "$mod.tar"

# Patch function
        _patch() {
            if [[ "$verbose" ]]; then
                msg3 "Patching.."
                patch -p0 -f -i "$i"
            else
                patch -p0 -s -f -i "$i"
            fi
        }

# Loop through all patches
        for i in ../patches/"$mod"*"$ver"*"$kernel"*.patch; do
            # Patch
            if ! _patch; then
                error "Failed to apply '$(basename "$i")'"
                read_msg2 "Continue? (Y/n) "
                if [[ "$REPLY" != [Yy] ]]; then
                    # Revert
                    msg "Reverting.."
                    cd ..
                    rm -r source/
                    mv "source-$ver/" source/

# Exit
                    msg2 "Done."
                    exit 1
                fi
            fi
        done

# Tar patched modules
        if [[ "$verbose" ]]; then
            msg3 "Recreating archives.."
        fi
        tar -cf "$mod.tar" "$mod-only"

# Leftovers
        rm -r "$mod-only"
    done
else
    msg2 "No patching required.."
fi

# Print 'vmware-modconfig-*.log's and exit
print_logs() {
    for i in /tmp/vmware-root/vmware-modconfig-*.log; do
        error2 "$i"
    done
    exit 1
}

# Install
msg "Installing modules.."
if [[ "$verbose" ]]; then
    if ! vmware-modconfig --console --install-all; then
        error "Unable to build. See:"
        print_logs
    fi
else
    if ! vmware-modconfig --console --install-all &>/dev/null; then
        error "Unable to build. Re-run with '-v' (--verbose) or see:"
        print_logs
    fi
fi

msg2 "Done."

Bearbeitung

Datei öffnen

#!/bin/bash -e

# Some colored makepkg-like functions
msg() {
    printf "${green}==>${bold} $1${all_off}\n"
}

msg_yellow() {
    printf "${yellow}==>${bold} $1${all_off}\n"
}

msg2() {
    printf "${blue}  ->${bold} $1${all_off}\n"
}

msg2_yellow() {
    printf "${yellow}  ->${bold} $1${all_off}\n"
}

read_msg2() {
    read -p "${blue}  ->${bold} $1${all_off}"
}

msg3() {
    printf "${yellow}    ->${bold} $1${all_off}\n"
}

error() {
    printf "${red}==> error:${bold} $1${all_off}\n"
}

error2() {
    printf "${red}    *${bold} $1${all_off}\n"
}

# Colors
all_off="$(tput sgr0)"
bold="${all_off}$(tput bold)"
blue="${bold}$(tput setaf 4)"
green="${bold}$(tput setaf 2)"
red="${bold}$(tput setaf 1)"
yellow="${bold}$(tput setaf 3)"

# Help message
usage() {
    echo "Usage: $(basename $0) [-f|-v|-V|-h]"
    echo "Automate the compilation of VMware modules for Arch Linux."
    echo
    echo "Available options:"
    echo "  -f, --force              Force reinstallation even, if modules already built"
    echo "  -v, --verbose            Use verbose output (patching, vmware-modconfig)"
    echo "  -V, --version            Print version information"
    echo "  -k <v>, --kernel=<v>     Patch the specified Linux kernel version"
    echo "  -h, --help               Print this help"
}

# Flags
while [[ "$1" ]]; do
    # Can't change $1
    opt="$1"
    # Parse current one
    while [[ "$opt" != "-" ]]; do
        # Define actions
        case "$opt" in
            -f* | --force)     force=1 ;;
            -v* | --verbose)   verbose=1 ;;
            -k)                shift; kernel_version="$1" ;;
            --kernel=*)        kernel_version="${opt#*=}" ;;
            -V* | --version)   version; exit 0 ;;
            -h* | --help)      usage; exit 0 ;;
            -*)                echo "$(basename $0): error: bad argument: $opt"
                               echo
                               usage $1; exit 0 ;;
            *) break ;;
        esac
        # Support single dash (-fv)
        # Remove first match ("${opt#-[fv]}")
        nextopt="${opt#-[fv]}"
        if [[ "$opt" != "$nextopt" ]]; then
            # Multiple short flags
		        opt="-$nextopt"
        else
            # Long form (--force/--verbose)
            break
        fi
    done
    shift
done

# Make sure we are root
if (( $EUID != 0 )); then
    error "This script needs to be run as root."
    exit 1
fi

# Is a VMware product installed?
if [[ ! -f /usr/bin/vmware-installer ]]; then
    error "No VMware product found. Exiting.."
    exit 1
fi

# Set some variables (|&: hide errors by redirecting all output)
if [[ -z $kernel_version ]]; then
    kernel_version=$(uname -r)
fi
[[ "$verbose" ]] && msg "Using Linux kernel $kernel_version" 
kernel=$(echo $kernel_version | cut -d "." -f-2)
ver=$(vmware-installer -l |& grep -Po "(player|workstation) *\K(\d+\.){2}\d+")
if vmware-installer -l |& grep -q "workstation"; then
    name="VMware Workstation"
else
    name="VMware Player (Plus)"
fi

# Make sure the directory exists
if [[ ! -d /usr/lib/modules/$kernel_version/ ]]; then
    error "/usr/lib/modules/$kernel_version/ not found. Exiting.."
    exit 1
fi

# Support the '-f' flag
# 1) Have we already built (vsock is built last)?
# 2) Don't check this until we've removed the leftovers
if [[ ! "$force" ]] && [[ -f /usr/lib/modules/$kernel_version/misc/vsock.ko ]]; then
    if [[ "$verbose" ]]; then
        msg "Verifying current state.."
    fi
    error "VMware modules already installed (use '-f' to override). Exiting.."
    exit 1
fi

# Unload conflicting in-kernel modules (VMware can't handle these in Arch)
if rmmod vmw_vsock_vmci_transport 2>/dev/null; then
    rmmod vmw_vmci vsock 2>/dev/null
fi

# Patch
# 1) Make sure we can build
# 2) &>/dev/null: hide all output (STDIN/STDERR)
msg "Patching $name v$ver for kernel $kernel_version.."
if ls patches/*"$ver"*"$kernel"*.patch &>/dev/null; then
    # Create a backup/Revert
    if [[ ! -d "source-$ver" ]]; then
        msg2_yellow "Backing up.."
        cp -r source/ "source-$ver/"
    else
        # Get the original sources from the backup (invalidate the need for 'vmware-unpatch')
        cp "source-$ver/"* source/
    fi

# Untar
        if [[ "$verbose" ]]; then
            msg3 "Extracting archives.."
        fi
        tar -xf "$mod.tar"

# Exit
                    msg2 "Done."
                    exit 1
                fi
            fi
        done

# Tar patched modules
        if [[ "$verbose" ]]; then
            msg3 "Recreating archives.."
        fi
        tar -cf "$mod.tar" "$mod-only"

# Leftovers
        rm -r "$mod-only"
    done
else
    msg2 "No patching required.."
fi

# Print 'vmware-modconfig-*.log's and exit
print_logs() {
    for i in /tmp/vmware-root/vmware-modconfig-*.log; do
        error2 "$i"
    done
    exit 1
}

# Install
msg "Installing modules.."
if [[ "$verbose" ]]; then
    if ! vmware-modconfig --console --install-all -k "$kernel_version"; then
        error "Unable to build. See:"
        print_logs
    fi
else
    if ! vmware-modconfig --console --install-all -k "$kernel_version" &>/dev/null; then
        error "Unable to build. Re-run with '-v' (--verbose) or see:"
        print_logs
    fi
fi

msg2 "Done."