diff --git a/centos-install.sh b/centos-install.sh index 8bde0d1..dda80db 100755 --- a/centos-install.sh +++ b/centos-install.sh @@ -9,7 +9,7 @@ if [ ! -d "$PYTHON_VENV_DIR" ]; then mkdir -pv "$PYTHON_VENV_DIR" fi -python -m venv --system-site-packages "${PYTHON_VENV_SIR}/sgbackup" +python -m venv --system-site-packages "${PYTHON_VENV_DIR}/sgbackup" . "${PYTHON_VENV_DIR}/sgbackup/bin/activate" pip install --upgrade pip pip install -r "${PROJECT_ROOT}/requirements.txt" @@ -19,37 +19,39 @@ if [ ! -d ~/.local/bin ]; then mkdir -pv ~/.local/bin fi -cat > "${PYTHON_VENV_DIR}/bin/sgbackup" << EOF +cat > "${PYTHON_VENV_DIR}/sgbackup/bin/sgbackup" << EOF #!/bin/bash -SELF="\$(realpath "$0")" -VENV_BINDR="\$(dirname "\$SELF")" - +SELF="\$(realpath "\$0")" +echo \$SELF +VENV_BINDIR="\$(dirname "\$SELF")" +echo \$VENV_BINDIR . "\$VENV_BINDIR/activate" -python -m sgbackup +echo "\$@" +python -m sgbackup "\$@" exit_code=\$? deactivate exit \$exit_code EOF -chmod +x "${PYTHON_VENV_DIR}/bin/sgbackup" -ln -sv "${PYHTHON_VENV_DIR}/bin/sgbackup" ~/.local/bin/sgbackup +chmod +x "${PYTHON_VENV_DIR}/sgbackup/bin/sgbackup" +ln -sv "${PYTHON_VENV_DIR}/sgbackup/bin/sgbackup" ~/.local/bin/sgbackup -cat > "${PYTHON_VENV_DIR}/bin/gsgbackup" << EOF +cat > "${PYTHON_VENV_DIR}/sgbackup/bin/gsgbackup" << EOF #!/bin/bash -SELF="\$(realpath "$0")" -VENV_BINDR="\$(dirname "\$SELF")" +SELF="\$(realpath "\$0")" +VENV_BINDIR="\$(dirname "\$SELF")" . "\$VENV_BINDIR/activate" -python -m sgbackup.gui +python -m sgbackup.gui "\$@" exit_code=\$? deactivate exit \$exit_code EOF -chmod +x "${PYTHON_VENV_DIR}/bin/gsbackup" -ln -sv "${PYTHON_VENV_DIR}/bin/gsgbackup" ~/.local/bin/gsgbackup +chmod +x "${PYTHON_VENV_DIR}/sgbackup/bin/gsbackup" +ln -sv "${PYTHON_VENV_DIR}/sgbackup/bin/gsgbackup" ~/.local/bin/gsgbackup diff --git a/fedora-install.sh b/fedora-install.sh index be30e15..4f11e54 100755 --- a/fedora-install.sh +++ b/fedora-install.sh @@ -9,7 +9,7 @@ if [ ! -d "$PYTHON_VENV_DIR" ]; then mkdir -pv "$PYTHON_VENV_DIR" fi -python -m venv --system-site-packages "${PYTHON_VENV_SIR}/sgbackup" +python -m venv --system-site-packages "${PYTHON_VENV_DIR}/sgbackup" . "${PYTHON_VENV_DIR}/sgbackup/bin/activate" pip install --upgrade pip pip install -r "${PROJECT_ROOT}/requirements.txt" @@ -19,37 +19,37 @@ if [ ! -d ~/.local/bin ]; then mkdir -pv ~/.local/bin fi -cat > "${PYTHON_VENV_DIR}/bin/sgbackup" << EOF +cat > "${PYTHON_VENV_DIR}/sgbackup/bin/sgbackup" << EOF #!/bin/bash -SELF="\$(realpath "$0")" -VENV_BINDR="\$(dirname "\$SELF")" +SELF="\$(realpath "\$0")" +VENV_BINDIR="\$(dirname "\$SELF")" . "\$VENV_BINDIR/activate" -python -m sgbackup +python -m sgbackup "\$@" exit_code=\$? deactivate exit \$exit_code EOF -chmod +x "${PYTHON_VENV_DIR}/bin/sgbackup" -ln -sv "${PYHTHON_VENV_DIR}/bin/sgbackup" ~/.local/bin/sgbackup +chmod +x "${PYTHON_VENV_DIR}/sgbackup/bin/sgbackup" +ln -sv "${PYTHON_VENV_DIR}/sgbackup/bin/sgbackup" ~/.local/bin/sgbackup -cat > "${PYTHON_VENV_DIR}/bin/gsgbackup" << EOF +cat > "${PYTHON_VENV_DIR}/sgbackup/bin/gsgbackup" << EOF #!/bin/bash -SELF="\$(realpath "$0")" -VENV_BINDR="\$(dirname "\$SELF")" +SELF="\$(realpath "\$0")" +VENV_BINDIR="\$(dirname "\$SELF")" . "\$VENV_BINDIR/activate" -python -m sgbackup.gui +python -m sgbackup.gui "\$@" exit_code=\$? deactivate exit \$exit_code EOF -chmod +x "${PYTHON_VENV_DIR}/bin/gsbackup" -ln -sv "${PYTHON_VENV_DIR}/bin/gsgbackup" ~/.local/bin/gsgbackup +chmod +x "${PYTHON_VENV_DIR}/sgbackup/bin/gsbackup" +ln -sv "${PYTHON_VENV_DIR}/sgbackup/bin/gsgbackup" ~/.local/bin/gsgbackup diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 8cf4d3c..0000000 --- a/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -rapidfuzz -