From af062c5608b6a4abb60c3d6ebc193d3ac929165b Mon Sep 17 00:00:00 2001 From: Jordan Wiens Date: Fri, 3 Nov 2017 15:53:08 -0400 Subject: point linux setup script at the right path for api install --- scripts/linux-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/linux-setup.sh') diff --git a/scripts/linux-setup.sh b/scripts/linux-setup.sh index f1650b7f..8bf15ddd 100755 --- a/scripts/linux-setup.sh +++ b/scripts/linux-setup.sh @@ -61,7 +61,7 @@ lastrun() pythonpath() { echo Configuring python path - ${SUDO}python ${BNPATH}/install_api.py $ROOT + ${SUDO}python ${BNPATH}/scripts/install_api.py $ROOT } createdesktopfile() -- cgit v1.3.1 From 9c53cec0d232d36ff56b91cd90b3837a0015b615 Mon Sep 17 00:00:00 2001 From: Nick Fox Date: Sun, 19 Nov 2017 15:57:31 -0500 Subject: Add missing quotes to fix issue with broken .desktop file --- scripts/linux-setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/linux-setup.sh') diff --git a/scripts/linux-setup.sh b/scripts/linux-setup.sh index 8bf15ddd..0b23bbb0 100755 --- a/scripts/linux-setup.sh +++ b/scripts/linux-setup.sh @@ -83,11 +83,11 @@ Comment=${APPCOMMENT} EOF if [ "${ROOT}" == "root" ] then - echo ${DESKTOP} | $SUDO tee ${DESKTOPFILE} >/dev/null + echo "${DESKTOP}" | $SUDO tee ${DESKTOPFILE} >/dev/null $SUDO chmod +x ${DESKTOPFILE} $SUDO update-desktop-database ${SHARE}/applications else - echo ${DESKTOP} > ${HOME}/Desktop/${APP}.desktop + echo "${DESKTOP}" > ${HOME}/Desktop/${APP}.desktop fi } -- cgit v1.3.1 From 5d502ffe11df31f9671c43df293db9fa390026f6 Mon Sep 17 00:00:00 2001 From: Nick Fox Date: Sun, 19 Nov 2017 16:17:09 -0500 Subject: Fix incorrect BNPATH: previously pointed to /scripts --- scripts/linux-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/linux-setup.sh') diff --git a/scripts/linux-setup.sh b/scripts/linux-setup.sh index 0b23bbb0..02af9623 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" -- cgit v1.3.1 From d9e2d2ff81ac214ed8296507b5564a6b76f90596 Mon Sep 17 00:00:00 2001 From: Nick Fox Date: Sun, 19 Nov 2017 16:29:26 -0500 Subject: Fix bugs in setup script by removing unneeded sudo conditionals --- scripts/linux-setup.sh | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) (limited to 'scripts/linux-setup.sh') diff --git a/scripts/linux-setup.sh b/scripts/linux-setup.sh index 02af9623..e18082e1 100755 --- a/scripts/linux-setup.sh +++ b/scripts/linux-setup.sh @@ -81,14 +81,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() @@ -108,16 +103,12 @@ createmime() -"| $SUDO tee ${MIMEFILE} >/dev/null +"| $SUDO tee ${MIMEFILEbinary} >/dev/null #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 +118,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 } -- cgit v1.3.1 From b86e60ffa3e95f0470a8f10828b38006b20b33cd Mon Sep 17 00:00:00 2001 From: Nick Fox Date: Sun, 19 Nov 2017 19:31:31 -0500 Subject: Fix typo in MIME filename introduced in last commit --- scripts/linux-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/linux-setup.sh') diff --git a/scripts/linux-setup.sh b/scripts/linux-setup.sh index e18082e1..3409d094 100755 --- a/scripts/linux-setup.sh +++ b/scripts/linux-setup.sh @@ -103,7 +103,7 @@ createmime() -"| $SUDO tee ${MIMEFILEbinary} >/dev/null +"| $SUDO tee ${MIMEFILE} >/dev/null #echo Copying icon #$SUDO cp $PNG $IMAGEFILE -- cgit v1.3.1 From 9850719b95278ff9890fff3551623635404b4f0c Mon Sep 17 00:00:00 2001 From: Nick Fox Date: Sun, 19 Nov 2017 20:18:36 -0500 Subject: Remove unnecessary trailing slash in BNPATH --- scripts/linux-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/linux-setup.sh') diff --git a/scripts/linux-setup.sh b/scripts/linux-setup.sh index 3409d094..c0e3697f 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" -- cgit v1.3.1 From adfddcf0ce0875df4512cd05a58cd1d5bc7e49d5 Mon Sep 17 00:00:00 2001 From: Nick Fox Date: Sun, 19 Nov 2017 22:06:36 -0500 Subject: Check python version and use python2 if python3 is default --- scripts/linux-setup.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'scripts/linux-setup.sh') diff --git a/scripts/linux-setup.sh b/scripts/linux-setup.sh index c0e3697f..c6e376ce 100755 --- a/scripts/linux-setup.sh +++ b/scripts/linux-setup.sh @@ -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() -- cgit v1.3.1 From 26edabfdd7211012c7c8a03186d3025eea9aa345 Mon Sep 17 00:00:00 2001 From: Jordan Wiens Date: Wed, 20 Dec 2017 16:12:15 -0500 Subject: fixes broken lastrun creation --- scripts/linux-setup.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'scripts/linux-setup.sh') diff --git a/scripts/linux-setup.sh b/scripts/linux-setup.sh index c6e376ce..bb1e0f28 100755 --- a/scripts/linux-setup.sh +++ b/scripts/linux-setup.sh @@ -54,6 +54,10 @@ lastrun() then echo lastrun already exists, remove to create a new one else + if [ ! -d ${HOME}/.binaryninja ] + then + mkdir ${HOME}/.binaryninja + fi echo ${BNPATH} > ${HOME}/.binaryninja/lastrun fi } -- cgit v1.3.1