diff options
| author | Jordan <jordan@psifertex.com> | 2017-12-20 16:11:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-20 16:11:03 -0500 |
| commit | 8c67a3a275b75ba799ce2e03081afeb916766849 (patch) | |
| tree | 786c77741e3d2a2ed5042ac3eeb45d7d4d8b312b /scripts | |
| parent | 0963fc9e3623f9758afb63b4b089a0fa7873c395 (diff) | |
| parent | adfddcf0ce0875df4512cd05a58cd1d5bc7e49d5 (diff) | |
Merge pull request #877 from njfox/linux_setup
Fix issues in linux-setup.sh
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/linux-setup.sh | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/scripts/linux-setup.sh b/scripts/linux-setup.sh index 8bf15ddd..c6e376ce 100755 --- a/scripts/linux-setup.sh +++ b/scripts/linux-setup.sh @@ -14,7 +14,7 @@ setvars() APP="binaryninja" FILECOMMENT="Binary Ninja Analysis Database" APPCOMMENT="Binary Ninja: A Reverse Engineering Platform" - BNPATH=$(dirname $(readlink -f "$0")) + BNPATH="$(dirname $(readlink -f "$0"))/.." EXEC="${BNPATH}/binaryninja" PNG="${BNPATH}/docs/images/logo.png" EXT="bndb" @@ -61,7 +61,12 @@ lastrun() pythonpath() { echo Configuring python path - ${SUDO}python ${BNPATH}/scripts/install_api.py $ROOT + if [[ $(python -V) == "Python 3."* ]] + then + ${SUDO}python2 ${BNPATH}/scripts/install_api.py $ROOT + else + ${SUDO}python ${BNPATH}/scripts/install_api.py $ROOT + fi } createdesktopfile() @@ -81,14 +86,9 @@ Type=Application Categories=Utility; Comment=${APPCOMMENT} EOF - if [ "${ROOT}" == "root" ] - then - echo ${DESKTOP} | $SUDO tee ${DESKTOPFILE} >/dev/null - $SUDO chmod +x ${DESKTOPFILE} - $SUDO update-desktop-database ${SHARE}/applications - else - echo ${DESKTOP} > ${HOME}/Desktop/${APP}.desktop - fi + echo "${DESKTOP}" | $SUDO tee ${DESKTOPFILE} >/dev/null + $SUDO chmod +x ${DESKTOPFILE} + $SUDO update-desktop-database ${SHARE}/applications } createmime() @@ -112,12 +112,8 @@ createmime() #echo Copying icon #$SUDO cp $PNG $IMAGEFILE - if [ "${ROOT}" == "root" ] - then - $SUDO cp ${PNG} ${IMAGEFILE} - $SUDO update-mime-database ${SHARE}/mime - fi - + $SUDO cp ${PNG} ${IMAGEFILE} + $SUDO update-mime-database ${SHARE}/mime } addtodesktop() @@ -127,11 +123,8 @@ addtodesktop() uninstall() { - rm -i -r $DESKTOPFILE $MIMEFILE $IMAGEFILE - if [ "$ROOT" == "root" ] - then - $SUDO update-mime-database ${SHARE}/mime - fi + rm -i -r $DESKTOPFILE $MIMEFILE $IMAGEFILE ${HOME}/Desktop/${APP}.desktop + $SUDO update-mime-database ${SHARE}/mime exit 0 } |