From bd9b3b63ec9b25d0a57f00c13964aa3881d87616 Mon Sep 17 00:00:00 2001 From: Olivier Kaloudoff Date: Sat, 20 Mar 2021 18:02:25 +0100 Subject: [PATCH] update prefix /accounts/1000/shared/documents/clitools -> /accounts/1000/shared/misc/clitools see: https://github.com/BerryFarm/berrymuch/issues/54 --- .gitignore | 1 - README.md | 2 +- env.sh | 2 +- install.sh | 2 +- lib.sh | 2 +- ports-wip/perl/README | 2 +- ports-wip/python322_/build.sh | 2 +- ports/dropbear/patches/etc.patch | 6 +++--- 8 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index a4786b3883..b94778e063 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ work/ *.tar.gz *.tar.bz2 *.zip -install.sh .profile conf/ clitools/ diff --git a/README.md b/README.md index 6d0e0b451a..965502c0a3 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ The project is standing on the shoulders of giants including [playbook-dev-tools * Install a terminal app (we recommend [term48](https://appworld.blackberry.com/webstore/content/26272878/?lang=en)) and run: ``` - cd /accounts/1000/shared/documents + cd /accounts/1000/shared/misc/clitools sh install.sh ``` * Restart your terminal app and enjoy Berrymuch! diff --git a/env.sh b/env.sh index 3d6b227a9a..2735538f7e 100644 --- a/env.sh +++ b/env.sh @@ -1,4 +1,4 @@ -NATIVE_TOOLS="/accounts/1000/shared/documents/clitools" +NATIVE_TOOLS="/accounts/1000/shared/misc/clitools" QNX_TARGET=$NATIVE_TOOLS/target_10_3_1_995/qnx6 export NATIVE_TOOLS QNX_TARGET diff --git a/install.sh b/install.sh index ae182e91a2..1764d67600 100644 --- a/install.sh +++ b/install.sh @@ -1,5 +1,5 @@ #!/bin/sh -D=/accounts/1000/shared/documents/clitools +D=/accounts/1000/shared/misc/clitools mkdir -p $D; mv clitools.zip $D cd $D diff --git a/lib.sh b/lib.sh index eb87ac10c6..4cf43259e8 100644 --- a/lib.sh +++ b/lib.sh @@ -13,7 +13,7 @@ PBHOSTARCH=arm-unknown-nto-qnx8.0.0eabi PBBUILDARCH=`gcc -dumpmachine` PBTARGETARCH=arm-unknown-nto-qnx8.0.0eabi -DEFAULTPREFIX='/accounts/1000/shared/documents/clitools' +DEFAULTPREFIX='/accounts/1000/shared/misc/clitools' usage() { diff --git a/ports-wip/perl/README b/ports-wip/perl/README index a88c7add8a..fa71ee43a1 100644 --- a/ports-wip/perl/README +++ b/ports-wip/perl/README @@ -6,7 +6,7 @@ To be able to communicate with the BlackBerry, you have to share the wifi connex The BlackBerry will receive ip address 192.168.0.1. Now you may start Term48 on your BlackBerry -Then, using playbook-dev-tools, launch "/accounts/1000/shared/documents/clitools/sshd" witch will be listening to port 2022 by default. +Then, using playbook-dev-tools, launch "/accounts/1000/shared/misc/clitools/bin//sshd" witch will be listening to port 2022 by default. You may now add the following compilation option to perl so he can ssh to your BlackBerry phone and ./try some commands to validate the good results of compilation. diff --git a/ports-wip/python322_/build.sh b/ports-wip/python322_/build.sh index 2e5e753d33..1d6eccb5cf 100755 --- a/ports-wip/python322_/build.sh +++ b/ports-wip/python322_/build.sh @@ -45,7 +45,7 @@ if [ "$TASK" == "bundle" ] then echo "Zipping and copying to packages" echo $ROOTDIR - cd $WORKROOT/$DISTVER/nto-armv7/accounts/1000/shared/documents/clitools + cd $WORKROOT/$DISTVER/nto-armv7/accounts/1000/shared/misc/clitools zip -yr $DISTVER.zip . mv $DISTVER.zip $ROOTDIR/packages diff --git a/ports/dropbear/patches/etc.patch b/ports/dropbear/patches/etc.patch index 7d4da57041..4b3ef7488e 100644 --- a/ports/dropbear/patches/etc.patch +++ b/ports/dropbear/patches/etc.patch @@ -9,9 +9,9 @@ index 9000fcc..2f796c4 100644 -#define DSS_PRIV_FILENAME "/etc/dropbear/dropbear_dss_host_key" -#define RSA_PRIV_FILENAME "/etc/dropbear/dropbear_rsa_host_key" -#define ECDSA_PRIV_FILENAME "/etc/dropbear/dropbear_ecdsa_host_key" -+#define DSS_PRIV_FILENAME "/accounts/1000/shared/documents/clitools/etc/dropbear/dropbear_dss_host_key" -+#define RSA_PRIV_FILENAME "/accounts/1000/shared/documents/clitools/etc/dropbear/dropbear_rsa_host_key" -+#define ECDSA_PRIV_FILENAME "/accounts/1000/shared/documents/clitools/etc/dropbear/dropbear_ecdsa_host_key" ++#define DSS_PRIV_FILENAME "accounts/1000/shared/misc/clitools/etc/dropbear/dropbear_dss_host_key" ++#define RSA_PRIV_FILENAME "/accounts/1000/shared/misc/clitools/etc/dropbear/dropbear_rsa_host_key" ++#define ECDSA_PRIV_FILENAME "/accounts/1000/shared/misc/clitools/etc/dropbear/dropbear_ecdsa_host_key" /* Set NON_INETD_MODE if you require daemon functionality (ie Dropbear listens * on chosen ports and keeps accepting connections. This is the default.