Use getlogin() to get user for commands

- Suggestion per @2bndy5
nRF24 · Jun 19, 2024 · 1445413 · 1445413
1 parent 11f0d14
commit 1445413
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/RF24Gateway.cpp b/RF24Gateway.cpp
@@ -211,8 +211,8 @@ int ESBGateway<mesh_t, network_t, radio_t>::allocateTunDevice(char* dev, int fla
         std::cerr << "RF24Gw: Error: enabling TUNSETIFF" << std::endl;
         uint32_t UID = getuid();
         if (UID) {
-            std::cout << "Not running as root, preconfigure the interface as follows, where 'pi' is your username" << std::endl;
-            std::cout << "sudo ip tuntap add dev tun_nrf24 mode tun user pi multi_queue" << std::endl;
+            std::cout << "Not running as root, preconfigure the interface as follows" << std::endl;
+            std::cout << "sudo ip tuntap add dev tun_nrf24 mode tun user " << getlogin() << " multi_queue" << std::endl;
             std::cout << "sudo ifconfig tun_nrf24 10.10.2.2/24" << std::endl;
         }
         return -1;

diff --git a/examples/ncurses/RF24Gateway_ncurses.cpp b/examples/ncurses/RF24Gateway_ncurses.cpp
@@ -551,8 +551,8 @@ void drawCfg(bool isConf)
             mvwprintw(win, 8, 1, "Unable to set IP/Subnet \n");
             uint32_t UID = getuid();
             if (UID) {
-                mvwprintw(win, 9, 1, "Not running as root, configure as follows, where 'pi' is your username:\n");
-                mvwprintw(win, 10, 1, "sudo ip tuntap add dev tun_nrf24 mode tun user pi multi_queue\n");
+                mvwprintw(win, 9, 1, "Not running as root, configure as follows:\n");
+                mvwprintw(win, 10, 1, "sudo ip tuntap add dev tun_nrf24 mode tun user %s multi_queue\n", getlogin());
                 mvwprintw(win, 11, 1, "sudo ifconfig tun_nrf24 10.10.2.2/24\n");
             }
             refresh();

diff --git a/examples/ncursesInt/RF24Gateway_ncursesInt.cpp b/examples/ncursesInt/RF24Gateway_ncursesInt.cpp
@@ -579,8 +579,8 @@ void drawCfg(bool isConf)
             mvwprintw(win, 8, 1, "Unable to set IP/Subnet \n");
             uint32_t UID = getuid();
             if (UID) {
-                mvwprintw(win, 9, 1, "Not running as root, configure as follows, where 'pi' is your username:\n");
-                mvwprintw(win, 10, 1, "sudo ip tuntap add dev tun_nrf24 mode tun user pi multi_queue\n");
+                mvwprintw(win, 9, 1, "Not running as root, configure as follows:\n");
+                mvwprintw(win, 10, 1, "sudo ip tuntap add dev tun_nrf24 mode tun user %s multi_queue\n", getlogin());
                 mvwprintw(win, 11, 1, "sudo ifconfig tun_nrf24 10.10.2.2/24\n");
             }
             refresh();